Skip to content

Commit 38fd643

Browse files
author
Vipin Jain
committed
add network oper proerties
1 parent 0a63e9c commit 38fd643

File tree

3 files changed

+71
-115
lines changed

3 files changed

+71
-115
lines changed

‎client/contivModelClient.go

+13
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,21 @@ type NetworkLinks struct {
279279
Tenant Link `json:"Tenant,omitempty"`
280280
}
281281

282+
type NetworkOper struct {
283+
AllocatedAddressesCount int `json:"allocatedAddressesCount,omitempty"` // Vlan/Vxlan Tag
284+
AllocatedIPAddresses string `json:"allocatedIPAddresses,omitempty"` // allocated IP addresses
285+
DnsServerIP string `json:"dnsServerIP,omitempty"` // dns IP for the network
286+
ExternalPktTag int `json:"externalPktTag,omitempty"` // external packet tag
287+
NumEndpoints int `json:"numEndpoints,omitempty"` // external packet tag
288+
PktTag int `json:"pktTag,omitempty"` // internal packet tag
289+
290+
OperLinks NetworkLinks `json:"links,omitempty"`
291+
}
292+
282293
type NetworkInspect struct {
283294
Config Network
295+
296+
Oper NetworkOper
284297
}
285298

286299
type Policy struct {

‎contivModel.go

+32-115
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,21 @@ type NetworkLinks struct {
156156
Tenant modeldb.Link `json:"Tenant,omitempty"`
157157
}
158158

159+
type NetworkOper struct {
160+
AllocatedAddressesCount int `json:"allocatedAddressesCount,omitempty"` // Vlan/Vxlan Tag
161+
AllocatedIPAddresses string `json:"allocatedIPAddresses,omitempty"` // allocated IP addresses
162+
DnsServerIP string `json:"dnsServerIP,omitempty"` // dns IP for the network
163+
ExternalPktTag int `json:"externalPktTag,omitempty"` // external packet tag
164+
NumEndpoints int `json:"numEndpoints,omitempty"` // external packet tag
165+
PktTag int `json:"pktTag,omitempty"` // internal packet tag
166+
167+
OperLinks NetworkLinks `json:"links,omitempty"`
168+
}
169+
159170
type NetworkInspect struct {
160171
Config Network
172+
173+
Oper NetworkOper
161174
}
162175
type Policy struct {
163176
// every object has a key
@@ -361,6 +374,8 @@ type GlobalCallbacks interface {
361374
}
362375

363376
type NetworkCallbacks interface {
377+
NetworkGetOper(network *NetworkInspect) error
378+
364379
NetworkCreate(network *Network) error
365380
NetworkUpdate(network, params *Network) error
366381
NetworkDelete(network *Network) error
@@ -726,17 +741,6 @@ func httpInspectAppProfile(w http.ResponseWriter, r *http.Request, vars map[stri
726741
return &obj, nil
727742
}
728743

729-
// Get a appProfileOper object
730-
func GetOperAppProfile(key string) error {
731-
obj := collections.appProfiles[key]
732-
if obj == nil {
733-
log.Errorf("appProfile %s not found", key)
734-
return errors.New("appProfile not found")
735-
}
736-
737-
return nil
738-
}
739-
740744
// CREATE REST call
741745
func httpCreateAppProfile(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
742746
log.Debugf("Received httpGetAppProfile: %+v", vars)
@@ -1012,17 +1016,6 @@ func httpInspectBgp(w http.ResponseWriter, r *http.Request, vars map[string]stri
10121016
return &obj, nil
10131017
}
10141018

1015-
// Get a BgpOper object
1016-
func GetOperBgp(key string) error {
1017-
obj := collections.Bgps[key]
1018-
if obj == nil {
1019-
log.Errorf("Bgp %s not found", key)
1020-
return errors.New("Bgp not found")
1021-
}
1022-
1023-
return nil
1024-
}
1025-
10261019
// CREATE REST call
10271020
func httpCreateBgp(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
10281021
log.Debugf("Received httpGetBgp: %+v", vars)
@@ -1315,17 +1308,6 @@ func httpInspectEndpointGroup(w http.ResponseWriter, r *http.Request, vars map[s
13151308
return &obj, nil
13161309
}
13171310

1318-
// Get a endpointGroupOper object
1319-
func GetOperEndpointGroup(key string) error {
1320-
obj := collections.endpointGroups[key]
1321-
if obj == nil {
1322-
log.Errorf("endpointGroup %s not found", key)
1323-
return errors.New("endpointGroup not found")
1324-
}
1325-
1326-
return nil
1327-
}
1328-
13291311
// CREATE REST call
13301312
func httpCreateEndpointGroup(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
13311313
log.Debugf("Received httpGetEndpointGroup: %+v", vars)
@@ -1867,17 +1849,6 @@ func httpInspectGlobal(w http.ResponseWriter, r *http.Request, vars map[string]s
18671849
return &obj, nil
18681850
}
18691851

1870-
// Get a globalOper object
1871-
func GetOperGlobal(key string) error {
1872-
obj := collections.globals[key]
1873-
if obj == nil {
1874-
log.Errorf("global %s not found", key)
1875-
return errors.New("global not found")
1876-
}
1877-
1878-
return nil
1879-
}
1880-
18811852
// CREATE REST call
18821853
func httpCreateGlobal(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
18831854
log.Debugf("Received httpGetGlobal: %+v", vars)
@@ -2159,16 +2130,28 @@ func httpInspectNetwork(w http.ResponseWriter, r *http.Request, vars map[string]
21592130
}
21602131
obj.Config = *objConfig
21612132

2133+
if err := GetOperNetwork(&obj); err != nil {
2134+
log.Errorf("GetNetwork error for: %+v. Err: %v", obj, err)
2135+
return nil, err
2136+
}
2137+
21622138
// Return the obj
21632139
return &obj, nil
21642140
}
21652141

21662142
// Get a networkOper object
2167-
func GetOperNetwork(key string) error {
2168-
obj := collections.networks[key]
2169-
if obj == nil {
2170-
log.Errorf("network %s not found", key)
2171-
return errors.New("network not found")
2143+
func GetOperNetwork(obj *NetworkInspect) error {
2144+
// Check if we handle this object
2145+
if objCallbackHandler.NetworkCb == nil {
2146+
log.Errorf("No callback registered for network object")
2147+
return errors.New("Invalid object type")
2148+
}
2149+
2150+
// Perform callback
2151+
err := objCallbackHandler.NetworkCb.NetworkGetOper(obj)
2152+
if err != nil {
2153+
log.Errorf("NetworkDelete retruned error for: %+v. Err: %v", obj, err)
2154+
return err
21722155
}
21732156

21742157
return nil
@@ -2487,17 +2470,6 @@ func httpInspectPolicy(w http.ResponseWriter, r *http.Request, vars map[string]s
24872470
return &obj, nil
24882471
}
24892472

2490-
// Get a policyOper object
2491-
func GetOperPolicy(key string) error {
2492-
obj := collections.policys[key]
2493-
if obj == nil {
2494-
log.Errorf("policy %s not found", key)
2495-
return errors.New("policy not found")
2496-
}
2497-
2498-
return nil
2499-
}
2500-
25012473
// CREATE REST call
25022474
func httpCreatePolicy(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
25032475
log.Debugf("Received httpGetPolicy: %+v", vars)
@@ -2773,17 +2745,6 @@ func httpInspectRule(w http.ResponseWriter, r *http.Request, vars map[string]str
27732745
return &obj, nil
27742746
}
27752747

2776-
// Get a ruleOper object
2777-
func GetOperRule(key string) error {
2778-
obj := collections.rules[key]
2779-
if obj == nil {
2780-
log.Errorf("rule %s not found", key)
2781-
return errors.New("rule not found")
2782-
}
2783-
2784-
return nil
2785-
}
2786-
27872748
// CREATE REST call
27882749
func httpCreateRule(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
27892750
log.Debugf("Received httpGetRule: %+v", vars)
@@ -3145,17 +3106,6 @@ func httpInspectServiceLB(w http.ResponseWriter, r *http.Request, vars map[strin
31453106
return &obj, nil
31463107
}
31473108

3148-
// Get a serviceLBOper object
3149-
func GetOperServiceLB(key string) error {
3150-
obj := collections.serviceLBs[key]
3151-
if obj == nil {
3152-
log.Errorf("serviceLB %s not found", key)
3153-
return errors.New("serviceLB not found")
3154-
}
3155-
3156-
return nil
3157-
}
3158-
31593109
// CREATE REST call
31603110
func httpCreateServiceLB(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
31613111
log.Debugf("Received httpGetServiceLB: %+v", vars)
@@ -3449,17 +3399,6 @@ func httpInspectTenant(w http.ResponseWriter, r *http.Request, vars map[string]s
34493399
return &obj, nil
34503400
}
34513401

3452-
// Get a tenantOper object
3453-
func GetOperTenant(key string) error {
3454-
obj := collections.tenants[key]
3455-
if obj == nil {
3456-
log.Errorf("tenant %s not found", key)
3457-
return errors.New("tenant not found")
3458-
}
3459-
3460-
return nil
3461-
}
3462-
34633402
// CREATE REST call
34643403
func httpCreateTenant(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
34653404
log.Debugf("Received httpGetTenant: %+v", vars)
@@ -3735,17 +3674,6 @@ func httpInspectVolume(w http.ResponseWriter, r *http.Request, vars map[string]s
37353674
return &obj, nil
37363675
}
37373676

3738-
// Get a volumeOper object
3739-
func GetOperVolume(key string) error {
3740-
obj := collections.volumes[key]
3741-
if obj == nil {
3742-
log.Errorf("volume %s not found", key)
3743-
return errors.New("volume not found")
3744-
}
3745-
3746-
return nil
3747-
}
3748-
37493677
// CREATE REST call
37503678
func httpCreateVolume(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
37513679
log.Debugf("Received httpGetVolume: %+v", vars)
@@ -4003,17 +3931,6 @@ func httpInspectVolumeProfile(w http.ResponseWriter, r *http.Request, vars map[s
40033931
return &obj, nil
40043932
}
40053933

4006-
// Get a volumeProfileOper object
4007-
func GetOperVolumeProfile(key string) error {
4008-
obj := collections.volumeProfiles[key]
4009-
if obj == nil {
4010-
log.Errorf("volumeProfile %s not found", key)
4011-
return errors.New("volumeProfile not found")
4012-
}
4013-
4014-
return nil
4015-
}
4016-
40173934
// CREATE REST call
40183935
func httpCreateVolumeProfile(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
40193936
log.Debugf("Received httpGetVolumeProfile: %+v", vars)

‎network.json

+26
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,32 @@
6464
"showSummary": true
6565
}
6666
},
67+
"operProperties": {
68+
"pktTag": {
69+
"type": "int",
70+
"title": "internal packet tag"
71+
},
72+
"externalPktTag": {
73+
"type": "int",
74+
"title": "external packet tag"
75+
},
76+
"numEndpoints": {
77+
"type": "int",
78+
"title": "external packet tag"
79+
},
80+
"allocatedAddressesCount": {
81+
"type": "int",
82+
"title": "Vlan/Vxlan Tag"
83+
},
84+
"allocatedIPAddresses": {
85+
"type": "string",
86+
"title": "allocated IP addresses"
87+
},
88+
"dnsServerIP": {
89+
"type": "string",
90+
"title": "dns IP for the network"
91+
}
92+
},
6793
"link-sets": {
6894
"services": {
6995
"ref": "service"

0 commit comments

Comments
 (0)