Merge pull request contiv#8 from abhinandanpb/master

updating bgp object

Author: shaleman

client/contivModel.js

@@ -208,7 +208,7 @@ var BgpSummaryView = React.createClass({
 				<ModalTrigger modal={<BgpModalView Bgp={ Bgp }/>}>
 					<tr key={ Bgp.key } className="info">
 
-						   
+						     
 					</tr>
 				</ModalTrigger>
 			);
@@ -220,7 +220,7 @@ var BgpSummaryView = React.createClass({
 				<thead>
 					<tr>
 
-					   
+					     
 					</tr>
 				</thead>
 				<tbody>
@@ -240,12 +240,16 @@ var BgpModalView = React.createClass({
 	        <div className='modal-body' style={ {margin: '5%',} }>
 
 
-				<Input type='text' label='AS id' ref='AS' defaultValue={obj.AS} placeholder='AS id' />
+				<Input type='text' label='AS id' ref='as' defaultValue={obj.as} placeholder='AS id' />
 
 				<Input type='text' label='host name' ref='hostname' defaultValue={obj.hostname} placeholder='host name' />
 
 				<Input type='text' label='Bgp  neighbor' ref='neighbor' defaultValue={obj.neighbor} placeholder='Bgp  neighbor' />
 
+				<Input type='text' label='AS id' ref='neighbor-as' defaultValue={obj.neighbor-as} placeholder='AS id' />
+			
+				<Input type='text' label='Bgp router intf ip' ref='routerip' defaultValue={obj.routerip} placeholder='Bgp router intf ip' />
+			
 			</div>
 	        <div className='modal-footer'>
 				<Button onClick={this.props.onRequestHide}>Close</Button>

client/contivModelClient.go

@@ -202,9 +202,11 @@ type Bgp struct {
 	// every object has a key
 	Key string `json:"key,omitempty"`
 
-	AS       string `json:"AS,omitempty"`       // AS id
-	Hostname string `json:"hostname,omitempty"` // host name
-	Neighbor string `json:"neighbor,omitempty"` // Bgp  neighbor
+	As         string `json:"as,omitempty"`          // AS id
+	Hostname   string `json:"hostname,omitempty"`    // host name
+	Neighbor   string `json:"neighbor,omitempty"`    // Bgp  neighbor
+	NeighborAs string `json:"neighbor-as,omitempty"` // AS id
+	Routerip   string `json:"routerip,omitempty"`    // Bgp router intf ip
 
 }
 

client/contivModelClient.py

@@ -178,9 +178,11 @@ def createBgp(self, obj):
 	    postUrl = self.baseUrl + '/api/Bgps/' + obj.hostname  + '/'
 
 	    jdata = json.dumps({ 
-			"AS": obj.AS, 
+			"as": obj.as, 
 			"hostname": obj.hostname, 
 			"neighbor": obj.neighbor, 
+			"neighbor-as": obj.neighbor-as, 
+			"routerip": obj.routerip, 
 	    })
 
 	    # Post the data

contivModel.go

@@ -75,9 +75,11 @@ type Bgp struct {
 	// every object has a key
 	Key string `json:"key,omitempty"`
 
-	AS       string `json:"AS,omitempty"`       // AS id
-	Hostname string `json:"hostname,omitempty"` // host name
-	Neighbor string `json:"neighbor,omitempty"` // Bgp  neighbor
+	As         string `json:"as,omitempty"`          // AS id
+	Hostname   string `json:"hostname,omitempty"`    // host name
+	Neighbor   string `json:"neighbor,omitempty"`    // Bgp  neighbor
+	NeighborAs string `json:"neighbor-as,omitempty"` // AS id
+	Routerip   string `json:"routerip,omitempty"`    // Bgp router intf ip
 
 }
 
@@ -1573,8 +1575,8 @@ func ValidateBgp(obj *Bgp) error {
 
 	// Validate each field
 
-	if len(obj.AS) > 64 {
-		return errors.New("AS string too long")
+	if len(obj.As) > 64 {
+		return errors.New("as string too long")
 	}
 
 	if len(obj.Hostname) > 256 {
@@ -1585,6 +1587,14 @@ func ValidateBgp(obj *Bgp) error {
 		return errors.New("neighbor string too long")
 	}
 
+	if len(obj.NeighborAs) > 64 {
+		return errors.New("neighbor-as string too long")
+	}
+
+	if len(obj.Routerip) > 15 {
+		return errors.New("routerip string too long")
+	}
+
 	return nil
 }
 

host.json

@@ -11,17 +11,26 @@
                                              "title": "host name",
                                              "length": 256
                                 },
-                                "AS":       {
+                                "routerip": {
+                                             "type": "string",
+                                             "title": "Bgp router intf ip",
+                                             "length": 15
+                                },
+                                "as":       {
+                                             "type": "string",
+                                             "title": "AS id",
+                                             "length": 64
+                                },
+                                "neighbor-as":       {
                                              "type": "string",
                                              "title": "AS id",
                                              "length": 64
                                 },
                                 "neighbor":{
                                         "type": "string",
                                         "title": "Bgp  neighbor",
-                                        "length": 15 
+                                        "length": 15
                                 }
                  }
         }]
 }
-