fwd_mode (#35)

Author: abhi

client/contivModel.js

@@ -313,7 +313,7 @@ var GlobalSummaryView = React.createClass({
 				<ModalTrigger modal={<GlobalModalView global={ global }/>}>
 					<tr key={ global.key } className="info">
 
-						    
+						     
 					</tr>
 				</ModalTrigger>
 			);
@@ -325,7 +325,7 @@ var GlobalSummaryView = React.createClass({
 				<thead>
 					<tr>
 
-					    
+					     
 					</tr>
 				</thead>
 				<tbody>
@@ -345,6 +345,8 @@ var GlobalModalView = React.createClass({
 	        <div className='modal-body' style={ {margin: '5%',} }>
 
 
+				<Input type='text' label='Forwarding Mode' ref='fwdMode' defaultValue={obj.fwdMode} placeholder='Forwarding Mode' />
+			
 				<Input type='text' label='name of this block(must be 'global')' ref='name' defaultValue={obj.name} placeholder='name of this block(must be 'global')' />
 
 				<Input type='text' label='Network infrastructure type' ref='networkInfraType' defaultValue={obj.networkInfraType} placeholder='Network infrastructure type' />

client/contivModelClient.go

@@ -266,6 +266,7 @@ type Global struct {
 	// every object has a key
 	Key string `json:"key,omitempty"`
 
+	FwdMode          string `json:"fwdMode,omitempty"`          // Forwarding Mode
 	Name             string `json:"name,omitempty"`             // name of this block(must be 'global')
 	NetworkInfraType string `json:"networkInfraType,omitempty"` // Network infrastructure type
 	Vlans            string `json:"vlans,omitempty"`            // Allowed vlan range

client/contivModelClient.py

@@ -245,6 +245,7 @@ def createGlobal(self, obj):
 	    postUrl = self.baseUrl + '/api/v1/globals/' + obj.name  + '/'
 
 	    jdata = json.dumps({ 
+			"fwdMode": obj.fwdMode, 
 			"name": obj.name, 
 			"networkInfraType": obj.networkInfraType, 
 			"vlans": obj.vlans, 

contivModel.go

@@ -140,6 +140,7 @@ type Global struct {
 	// every object has a key
 	Key string `json:"key,omitempty"`
 
+	FwdMode          string `json:"fwdMode,omitempty"`          // Forwarding Mode
 	Name             string `json:"name,omitempty"`             // name of this block(must be 'global')
 	NetworkInfraType string `json:"networkInfraType,omitempty"` // Network infrastructure type
 	Vlans            string `json:"vlans,omitempty"`            // Allowed vlan range
@@ -2273,6 +2274,15 @@ func ValidateGlobal(obj *Global) error {
 
 	// Validate each field
 
+	if len(obj.FwdMode) > 64 {
+		return errors.New("fwdMode string too long")
+	}
+
+	fwdModeMatch := regexp.MustCompile("^(bridge|routing)?$")
+	if fwdModeMatch.MatchString(obj.FwdMode) == false {
+		return errors.New("fwdMode string invalid format")
+	}
+
 	if len(obj.Name) > 64 {
 		return errors.New("name string too long")
 	}

global.json

@@ -30,7 +30,14 @@
 					"type": "string",
 					"title": "Allwed vxlan range",
 					"format": "^([0-9]{1,8}?-[0-9]{1,8}?)$"
-				}
+				},
+                                "fwdMode": {
+                                        "type": "string",
+                                        "title": "Forwarding Mode",
+                                        "length": 64,
+                                        "format": "^(bridge|routing)?$",
+                                        "ShowSummary": true
+                                }
 			},
 			"operProperties": {
 				"numNetworks": {