Skip to content

Commit 1d3e7e8

Browse files
gaurav-dalvishaleman
gaurav-dalvi
authored and
shaleman
committed
Regarding netplugin PR#548 (#43)
1 parent 7ec6db2 commit 1d3e7e8

6 files changed

+197
-3
lines changed

‎client/contivModelClient.go

+28-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ type EndpointGroupLinks struct {
250250
type EndpointGroupOper struct {
251251
Endpoints []EndpointOper `json:"endpoints,omitempty"`
252252
ExternalPktTag int `json:"externalPktTag,omitempty"` // external packet tag
253-
NumEndpoints int `json:"numEndpoints,omitempty"` // external packet tag
253+
NumEndpoints int `json:"numEndpoints,omitempty"` // number of endpoints
254254
PktTag int `json:"pktTag,omitempty"` // internal packet tag
255255

256256
}
@@ -404,8 +404,17 @@ type PolicyLinks struct {
404404
Tenant Link `json:"Tenant,omitempty"`
405405
}
406406

407+
type PolicyOper struct {
408+
Endpoints []EndpointOper `json:"endpoints,omitempty"`
409+
NumEndpoints int `json:"numEndpoints,omitempty"` // number of endpoints
410+
PolicyViolations int `json:"policyViolations,omitempty"` // number of policyViolations
411+
412+
}
413+
407414
type PolicyInspect struct {
408415
Config Policy
416+
417+
Oper PolicyOper
409418
}
410419

411420
type Rule struct {
@@ -498,8 +507,26 @@ type TenantLinkSets struct {
498507
Volumes map[string]Link `json:"Volumes,omitempty"`
499508
}
500509

510+
type TenantOper struct {
511+
EndpointGroups []EndpointGroupOper `json:"endpointGroups,omitempty"`
512+
Endpoints []EndpointOper `json:"endpoints,omitempty"`
513+
Networks []NetworkOper `json:"networks,omitempty"`
514+
Policies []PolicyOper `json:"policies,omitempty"`
515+
Servicelbs []ServiceLBOper `json:"servicelbs,omitempty"`
516+
TotalAppProfiles int `json:"totalAppProfiles,omitempty"` // total number of App-Profiles
517+
TotalEPGs int `json:"totalEPGs,omitempty"` // total number of EPGs
518+
TotalEndpoints int `json:"totalEndpoints,omitempty"` // total number of endpoints in the tenant
519+
TotalNetprofiles int `json:"totalNetprofiles,omitempty"` // total number of Netprofiles
520+
TotalNetworks int `json:"totalNetworks,omitempty"` // total number of networks
521+
TotalPolicies int `json:"totalPolicies,omitempty"` // total number of totalPolicies
522+
TotalServicelbs int `json:"totalServicelbs,omitempty"` // total number of Servicelbs
523+
524+
}
525+
501526
type TenantInspect struct {
502527
Config Tenant
528+
529+
Oper TenantOper
503530
}
504531

505532
type Volume struct {

‎client/contivModelClient.py

+20
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,16 @@ def listPolicy(self):
436436

437437

438438

439+
# Inspect policy
440+
def createPolicy(self, obj):
441+
postUrl = self.baseUrl + '/api/v1/inspect/policy/' + obj.tenantName + ":" + obj.policyName + '/'
442+
443+
retDate = urllib2.urlopen(postUrl)
444+
if retData == "Error":
445+
errorExit("list Policy failed")
446+
447+
return json.loads(retData)
448+
439449

440450
# Create rule
441451
def createRule(self, obj):
@@ -570,6 +580,16 @@ def listTenant(self):
570580

571581

572582

583+
# Inspect tenant
584+
def createTenant(self, obj):
585+
postUrl = self.baseUrl + '/api/v1/inspect/tenant/' + obj.tenantName + '/'
586+
587+
retDate = urllib2.urlopen(postUrl)
588+
if retData == "Error":
589+
errorExit("list Tenant failed")
590+
591+
return json.loads(retData)
592+
573593

574594
# Create volume
575595
def createVolume(self, obj):

‎contivModel.go

+78-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ type EndpointGroupLinks struct {
124124
type EndpointGroupOper struct {
125125
Endpoints []EndpointOper `json:"endpoints,omitempty"`
126126
ExternalPktTag int `json:"externalPktTag,omitempty"` // external packet tag
127-
NumEndpoints int `json:"numEndpoints,omitempty"` // external packet tag
127+
NumEndpoints int `json:"numEndpoints,omitempty"` // number of endpoints
128128
PktTag int `json:"pktTag,omitempty"` // internal packet tag
129129

130130
}
@@ -278,8 +278,17 @@ type PolicyLinks struct {
278278
Tenant modeldb.Link `json:"Tenant,omitempty"`
279279
}
280280

281+
type PolicyOper struct {
282+
Endpoints []EndpointOper `json:"endpoints,omitempty"`
283+
NumEndpoints int `json:"numEndpoints,omitempty"` // number of endpoints
284+
PolicyViolations int `json:"policyViolations,omitempty"` // number of policyViolations
285+
286+
}
287+
281288
type PolicyInspect struct {
282289
Config Policy
290+
291+
Oper PolicyOper
283292
}
284293

285294
type Rule struct {
@@ -372,8 +381,26 @@ type TenantLinkSets struct {
372381
Volumes map[string]modeldb.Link `json:"Volumes,omitempty"`
373382
}
374383

384+
type TenantOper struct {
385+
EndpointGroups []EndpointGroupOper `json:"endpointGroups,omitempty"`
386+
Endpoints []EndpointOper `json:"endpoints,omitempty"`
387+
Networks []NetworkOper `json:"networks,omitempty"`
388+
Policies []PolicyOper `json:"policies,omitempty"`
389+
Servicelbs []ServiceLBOper `json:"servicelbs,omitempty"`
390+
TotalAppProfiles int `json:"totalAppProfiles,omitempty"` // total number of App-Profiles
391+
TotalEPGs int `json:"totalEPGs,omitempty"` // total number of EPGs
392+
TotalEndpoints int `json:"totalEndpoints,omitempty"` // total number of endpoints in the tenant
393+
TotalNetprofiles int `json:"totalNetprofiles,omitempty"` // total number of Netprofiles
394+
TotalNetworks int `json:"totalNetworks,omitempty"` // total number of networks
395+
TotalPolicies int `json:"totalPolicies,omitempty"` // total number of totalPolicies
396+
TotalServicelbs int `json:"totalServicelbs,omitempty"` // total number of Servicelbs
397+
398+
}
399+
375400
type TenantInspect struct {
376401
Config Tenant
402+
403+
Oper TenantOper
377404
}
378405

379406
type Volume struct {
@@ -505,6 +532,8 @@ type NetworkCallbacks interface {
505532
}
506533

507534
type PolicyCallbacks interface {
535+
PolicyGetOper(policy *PolicyInspect) error
536+
508537
PolicyCreate(policy *Policy) error
509538
PolicyUpdate(policy, params *Policy) error
510539
PolicyDelete(policy *Policy) error
@@ -525,6 +554,8 @@ type ServiceLBCallbacks interface {
525554
}
526555

527556
type TenantCallbacks interface {
557+
TenantGetOper(tenant *TenantInspect) error
558+
528559
TenantCreate(tenant *Tenant) error
529560
TenantUpdate(tenant, params *Tenant) error
530561
TenantDelete(tenant *Tenant) error
@@ -3022,10 +3053,33 @@ func httpInspectPolicy(w http.ResponseWriter, r *http.Request, vars map[string]s
30223053
}
30233054
obj.Config = *objConfig
30243055

3056+
if err := GetOperPolicy(&obj); err != nil {
3057+
log.Errorf("GetPolicy error for: %+v. Err: %v", obj, err)
3058+
return nil, err
3059+
}
3060+
30253061
// Return the obj
30263062
return &obj, nil
30273063
}
30283064

3065+
// Get a policyOper object
3066+
func GetOperPolicy(obj *PolicyInspect) error {
3067+
// Check if we handle this object
3068+
if objCallbackHandler.PolicyCb == nil {
3069+
log.Errorf("No callback registered for policy object")
3070+
return errors.New("Invalid object type")
3071+
}
3072+
3073+
// Perform callback
3074+
err := objCallbackHandler.PolicyCb.PolicyGetOper(obj)
3075+
if err != nil {
3076+
log.Errorf("PolicyDelete retruned error for: %+v. Err: %v", obj, err)
3077+
return err
3078+
}
3079+
3080+
return nil
3081+
}
3082+
30293083
// LIST REST call
30303084
func httpListPolicys(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
30313085
log.Debugf("Received httpListPolicys: %+v", vars)
@@ -3974,10 +4028,33 @@ func httpInspectTenant(w http.ResponseWriter, r *http.Request, vars map[string]s
39744028
}
39754029
obj.Config = *objConfig
39764030

4031+
if err := GetOperTenant(&obj); err != nil {
4032+
log.Errorf("GetTenant error for: %+v. Err: %v", obj, err)
4033+
return nil, err
4034+
}
4035+
39774036
// Return the obj
39784037
return &obj, nil
39794038
}
39804039

4040+
// Get a tenantOper object
4041+
func GetOperTenant(obj *TenantInspect) error {
4042+
// Check if we handle this object
4043+
if objCallbackHandler.TenantCb == nil {
4044+
log.Errorf("No callback registered for tenant object")
4045+
return errors.New("Invalid object type")
4046+
}
4047+
4048+
// Perform callback
4049+
err := objCallbackHandler.TenantCb.TenantGetOper(obj)
4050+
if err != nil {
4051+
log.Errorf("TenantDelete retruned error for: %+v. Err: %v", obj, err)
4052+
return err
4053+
}
4054+
4055+
return nil
4056+
}
4057+
39814058
// LIST REST call
39824059
func httpListTenants(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
39834060
log.Debugf("Received httpListTenants: %+v", vars)

‎endpointGroup.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
},
6161
"numEndpoints": {
6262
"type": "int",
63-
"title": "external packet tag"
63+
"title": "number of endpoints"
6464
},
6565
"endpoints": {
6666
"type": "array",

‎policy.json

+15
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,21 @@
2424
"showSummary": true
2525
}
2626
},
27+
"operProperties": {
28+
"numEndpoints": {
29+
"type": "int",
30+
"title": "number of endpoints"
31+
},
32+
"policyViolations": {
33+
"type": "int",
34+
"title": "number of policyViolations"
35+
},
36+
"endpoints": {
37+
"type": "array",
38+
"items": "endpoint",
39+
"title": "endpoints associate with the policy"
40+
}
41+
},
2742
"link-sets": {
2843
"endpointGroups": {
2944
"ref": "endpointGroup"

‎tenant.json

+55
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,61 @@
2020
"format": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\\\-]*[a-zA-Z0-9])\\\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\\\-]*[A-Za-z0-9])?$"
2121
}
2222
},
23+
"operProperties": {
24+
"totalNetworks": {
25+
"type": "int",
26+
"title": "total number of networks"
27+
},
28+
"totalEPGs": {
29+
"type": "int",
30+
"title": "total number of EPGs"
31+
},
32+
"totalNetprofiles": {
33+
"type": "int",
34+
"title": "total number of Netprofiles"
35+
},
36+
"totalAppProfiles": {
37+
"type": "int",
38+
"title": "total number of App-Profiles"
39+
},
40+
"totalServicelbs": {
41+
"type": "int",
42+
"title": "total number of Servicelbs"
43+
},
44+
"totalPolicies": {
45+
"type": "int",
46+
"title": "total number of totalPolicies"
47+
},
48+
"totalEndpoints": {
49+
"type": "int",
50+
"title": "total number of endpoints in the tenant"
51+
},
52+
"endpoints": {
53+
"type": "array",
54+
"items": "endpoint",
55+
"title": "endpoints in the tenant"
56+
},
57+
"networks": {
58+
"type": "array",
59+
"items": "network",
60+
"title": "networks in the tenant"
61+
},
62+
"endpointGroups": {
63+
"type": "array",
64+
"items": "endpointGroup",
65+
"title": "endpointGroups in the tenant"
66+
},
67+
"policies": {
68+
"type": "array",
69+
"items": "policy",
70+
"title": "policies in the tenant"
71+
},
72+
"servicelbs": {
73+
"type": "array",
74+
"items": "serviceLB",
75+
"title": "servicelbs in the tenant"
76+
}
77+
},
2378
"link-sets": {
2479
"networks": {
2580
"ref": "network"

0 commit comments

Comments
 (0)