service load balancer

Author: abhi

client/contivModel.js

@@ -681,7 +681,7 @@ var ServiceLBSummaryView = React.createClass({
 				<ModalTrigger modal={<ServiceLBModalView ServiceLB={ ServiceLB }/>}>
 					<tr key={ ServiceLB.key } className="info">
 
-						    
+						      
 					</tr>
 				</ModalTrigger>
 			);
@@ -693,7 +693,7 @@ var ServiceLBSummaryView = React.createClass({
 				<thead>
 					<tr>
 
-					    
+					      
 					</tr>
 				</thead>
 				<tbody>
@@ -713,11 +713,15 @@ var ServiceLBModalView = React.createClass({
 	        <div className='modal-body' style={ {margin: '5%',} }>
 
 
+				<Input type='text' label='Service ip' ref='ipAddress' defaultValue={obj.ipAddress} placeholder='Service ip' />
+			
 				<Input type='text' label='labels key value pair' ref='labels' defaultValue={obj.labels} placeholder='labels key value pair' />
 
-				<Input type='text' label='service name' ref='serviceName' defaultValue={obj.serviceName} placeholder='service name' />
+				<Input type='text' label='Service subnet' ref='network' defaultValue={obj.network} placeholder='Service subnet' />
 
-				<Input type='text' label='Service subnet' ref='subnet' defaultValue={obj.subnet} placeholder='Service subnet' />
+				<Input type='text' label='service provider port' ref='ports' defaultValue={obj.ports} placeholder='service provider port' />
+			
+				<Input type='text' label='service name' ref='serviceName' defaultValue={obj.serviceName} placeholder='service name' />
 
 				<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
 

client/contivModelClient.go

@@ -348,10 +348,12 @@ type ServiceLB struct {
 	// every object has a key
 	Key string `json:"key,omitempty"`
 
-	Labels      string `json:"labels,omitempty"`      // labels key value pair
-	ServiceName string `json:"serviceName,omitempty"` // service name
-	Subnet      string `json:"subnet,omitempty"`      // Service subnet
-	TenantName  string `json:"tenantName,omitempty"`  // Tenant Name
+	IpAddress   string   `json:"ipAddress,omitempty"` // Service ip
+	Labels      []string `json:"labels,omitempty"`
+	Network     string   `json:"network,omitempty"` // Service subnet
+	Ports       []string `json:"ports,omitempty"`
+	ServiceName string   `json:"serviceName,omitempty"` // service name
+	TenantName  string   `json:"tenantName,omitempty"`  // Tenant Name
 
 }
 

client/contivModelClient.py

@@ -404,9 +404,11 @@ def createServiceLB(self, obj):
 	    postUrl = self.baseUrl + '/api/ServiceLBs/' + obj.serviceName + ":" + obj.tenantName  + '/'
 
 	    jdata = json.dumps({ 
+			"ipAddress": obj.ipAddress, 
 			"labels": obj.labels, 
+			"network": obj.network, 
+			"ports": obj.ports, 
 			"serviceName": obj.serviceName, 
-			"subnet": obj.subnet, 
 			"tenantName": obj.tenantName, 
 	    })
 

contivModel.go

@@ -221,10 +221,12 @@ type ServiceLB struct {
 	// every object has a key
 	Key string `json:"key,omitempty"`
 
-	Labels      string `json:"labels,omitempty"`      // labels key value pair
-	ServiceName string `json:"serviceName,omitempty"` // service name
-	Subnet      string `json:"subnet,omitempty"`      // Service subnet
-	TenantName  string `json:"tenantName,omitempty"`  // Tenant Name
+	IpAddress   string   `json:"ipAddress,omitempty"` // Service ip
+	Labels      []string `json:"labels,omitempty"`
+	Network     string   `json:"network,omitempty"` // Service subnet
+	Ports       []string `json:"ports,omitempty"`
+	ServiceName string   `json:"serviceName,omitempty"` // service name
+	TenantName  string   `json:"tenantName,omitempty"`  // Tenant Name
 
 }
 
@@ -3121,16 +3123,16 @@ func ValidateServiceLB(obj *ServiceLB) error {
 
 	// Validate each field
 
-	if len(obj.Labels) > 512 {
-		return errors.New("labels string too long")
+	if len(obj.IpAddress) > 15 {
+		return errors.New("ipAddress string too long")
 	}
 
-	if len(obj.ServiceName) > 256 {
-		return errors.New("serviceName string too long")
+	if len(obj.Network) > 15 {
+		return errors.New("network string too long")
 	}
 
-	if len(obj.Subnet) > 15 {
-		return errors.New("subnet string too long")
+	if len(obj.ServiceName) > 256 {
+		return errors.New("serviceName string too long")
 	}
 
 	if len(obj.TenantName) > 64 {

services.json

@@ -17,7 +17,7 @@
                                         "length": 64
                                 },
 
-                                "subnet": {
+                                "network": {
                                              "type": "string",
                                              "title": "Service subnet",
                                              "length": 15
@@ -28,9 +28,16 @@
                                             "length": 15
                                 },
                                 "labels":       {
-                                             "type": "string",
+                                             "type": "array",
                                              "title": "labels key value pair",
-                                             "length": 512
+                                             "length": 512,
+					     "items" :"string"
+                                },
+                                "ports":{
+                                            "type":"array",
+                                            "title":"service provider port",
+                                            "length": 32,
+                                            "items" : "string"
                                 }
                  }
         }]