Oper state changes for service lb (#28)

* fixing minor issues

* avoid generating operlinks

* support for oper only objects

* service lb oper state

* updating changes

Author: abhi

client/contivModelClient.go

@@ -407,8 +407,17 @@ type ServiceLBLinks struct {
 	Tenant  Link `json:"Tenant,omitempty"`
 }
 
+type ServiceLBOper struct {
+	NumProviders int            `json:"numProviders,omitempty"` //  number of provider endpoints for the service
+	Providers    []EndpointOper `json:"providers,omitempty"`
+	ServiceVip   string         `json:"serviceVip,omitempty"` // allocated IP addresses
+
+}
+
 type ServiceLBInspect struct {
 	Config ServiceLB
+
+	Oper ServiceLBOper
 }
 
 type Tenant struct {

client/contivModelClient.py

@@ -463,6 +463,16 @@ def listServiceLB(self):
 
 
 
+	# Inspect serviceLB
+	def createServiceLB(self, obj):
+	    postUrl = self.baseUrl + '/api/v1/inspect/serviceLB/' + obj.tenantName + ":" + obj.serviceName  + '/'
+
+	    retDate = urllib2.urlopen(postUrl)
+	    if retData == "Error":
+	        errorExit("list ServiceLB failed")
+
+	    return json.loads(retData)
+
 
 	# Create tenant
 	def createTenant(self, obj):

contivModel.go

@@ -281,8 +281,17 @@ type ServiceLBLinks struct {
 	Tenant  modeldb.Link `json:"Tenant,omitempty"`
 }
 
+type ServiceLBOper struct {
+	NumProviders int            `json:"numProviders,omitempty"` //  number of provider endpoints for the service
+	Providers    []EndpointOper `json:"providers,omitempty"`
+	ServiceVip   string         `json:"serviceVip,omitempty"` // allocated IP addresses
+
+}
+
 type ServiceLBInspect struct {
 	Config ServiceLB
+
+	Oper ServiceLBOper
 }
 
 type Tenant struct {
@@ -440,6 +449,8 @@ type RuleCallbacks interface {
 }
 
 type ServiceLBCallbacks interface {
+	ServiceLBGetOper(serviceLB *ServiceLBInspect) error
+
 	ServiceLBCreate(serviceLB *ServiceLB) error
 	ServiceLBUpdate(serviceLB, params *ServiceLB) error
 	ServiceLBDelete(serviceLB *ServiceLB) error
@@ -3218,10 +3229,33 @@ func httpInspectServiceLB(w http.ResponseWriter, r *http.Request, vars map[strin
 	}
 	obj.Config = *objConfig
 
+	if err := GetOperServiceLB(&obj); err != nil {
+		log.Errorf("GetServiceLB error for: %+v. Err: %v", obj, err)
+		return nil, err
+	}
+
 	// Return the obj
 	return &obj, nil
 }
 
+// Get a serviceLBOper object
+func GetOperServiceLB(obj *ServiceLBInspect) error {
+	// Check if we handle this object
+	if objCallbackHandler.ServiceLBCb == nil {
+		log.Errorf("No callback registered for serviceLB object")
+		return errors.New("Invalid object type")
+	}
+
+	// Perform callback
+	err := objCallbackHandler.ServiceLBCb.ServiceLBGetOper(obj)
+	if err != nil {
+		log.Errorf("ServiceLBDelete retruned error for: %+v. Err: %v", obj, err)
+		return err
+	}
+
+	return nil
+}
+
 // LIST REST call
 func httpListServiceLBs(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
 	log.Debugf("Received httpListServiceLBs: %+v", vars)

servicelb.json

@@ -43,6 +43,21 @@
                 "items" : "string"
             }
         },
+        "operProperties": {
+          "serviceVip": {
+            "type": "string",
+            "title": "allocated IP addresses"
+          },
+          "numProviders": {
+            "type": "int",
+            "title": " number of provider endpoints for the service"
+          },
+          "providers": {
+            "type": "array",
+            "items": "endpoint",
+            "title": "provider endpoints for the service"
+          }
+        },
         "links": {
             "tenant": {
                 "ref": "tenant"