rebase to master

Author: shaleman

client/contivModel.js

@@ -389,12 +389,6 @@ var PolicyModalView = React.createClass({
 
 				<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
 
-				<Input type='text' label='To Endpoint Group' ref='toEndpointGroup' defaultValue={obj.toEndpointGroup} placeholder='To Endpoint Group' />
-			
-				<Input type='text' label='IP Address' ref='toIpAddress' defaultValue={obj.toIpAddress} placeholder='IP Address' />
-			
-				<Input type='text' label='To Network' ref='toNetwork' defaultValue={obj.toNetwork} placeholder='To Network' />
-			
 			</div>
 	        <div className='modal-footer'>
 				<Button onClick={this.props.onRequestHide}>Close</Button>
@@ -512,6 +506,12 @@ var RuleModalView = React.createClass({
 
 				<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
 
+				<Input type='text' label='To Endpoint Group' ref='toEndpointGroup' defaultValue={obj.toEndpointGroup} placeholder='To Endpoint Group' />
+			
+				<Input type='text' label='IP Address' ref='toIpAddress' defaultValue={obj.toIpAddress} placeholder='IP Address' />
+			
+				<Input type='text' label='To Network' ref='toNetwork' defaultValue={obj.toNetwork} placeholder='To Network' />
+			
 			</div>
 	        <div className='modal-footer'>
 				<Button onClick={this.props.onRequestHide}>Close</Button>

client/contivModelClient.go

@@ -593,12 +593,12 @@ func (c *ContivClient) BgpPost(obj *Bgp) error {
 }
 
 // BgpList lists all Bgp objects
-func (c *ContivClient) BgpList() (*[]Bgp, error) {
+func (c *ContivClient) BgpList() (*[]*Bgp, error) {
 	// build key and URL
 	url := c.baseURL + "/api/Bgps/"
 
 	// http get the object
-	var objList []Bgp
+	var objList []*Bgp
 	err := httpGet(url, &objList)
 	if err != nil {
 		log.Errorf("Error getting Bgps. Err: %v", err)

contivModel.go

@@ -1842,14 +1842,6 @@ func ValidateNetwork(obj *Network) error {
 		return errors.New("tenantName string too long")
 	}
 
-	if len(obj.ToEndpointGroup) > 64 {
-		return errors.New("toEndpointGroup string too long")
-	}
-
-	if len(obj.ToNetwork) > 64 {
-		return errors.New("toNetwork string too long")
-	}
-
 	return nil
 }
 
@@ -2369,6 +2361,14 @@ func ValidateRule(obj *Rule) error {
 		return errors.New("tenantName string too long")
 	}
 
+	if len(obj.ToEndpointGroup) > 64 {
+		return errors.New("toEndpointGroup string too long")
+	}
+
+	if len(obj.ToNetwork) > 64 {
+		return errors.New("toNetwork string too long")
+	}
+
 	return nil
 }