Skip to content

Commit e2527ca

Browse files
jojimtshaleman
jojimt
authored and
shaleman
committed
Make epg<-->network relationship an association instead of a child->parent (#23)
1 parent 945d1d9 commit e2527ca

7 files changed

+26
-56
lines changed

‎appProfile.json

+1-10
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,14 @@
44
{
55
"name": "appProfile",
66
"type": "object",
7-
"key": [ "tenantName", "networkName", "appProfileName" ],
7+
"key": [ "tenantName", "appProfileName" ],
88
"properties": {
99
"tenantName": {
1010
"type": "string",
1111
"title": "Tenant Name",
1212
"length": 64,
1313
"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])$"
1414
},
15-
"networkName": {
16-
"type": "string",
17-
"title": "Network of App Prof",
18-
"length": 64,
19-
"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])$"
20-
},
2115
"appProfileName": {
2216
"type": "string",
2317
"title": "Application Profile Name",
@@ -38,9 +32,6 @@
3832
"links": {
3933
"tenant": {
4034
"ref": "tenant"
41-
},
42-
"network": {
43-
"ref": "network"
4435
}
4536
}
4637
}

‎client/contivModel.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var AppProfileSummaryView = React.createClass({
1212
<ModalTrigger modal={<AppProfileModalView appProfile={ appProfile }/>}>
1313
<tr key={ appProfile.key } className="info">
1414

15-
15+
1616
</tr>
1717
</ModalTrigger>
1818
);
@@ -24,7 +24,7 @@ var AppProfileSummaryView = React.createClass({
2424
<thead>
2525
<tr>
2626

27-
27+
2828
</tr>
2929
</thead>
3030
<tbody>
@@ -48,8 +48,6 @@ var AppProfileModalView = React.createClass({
4848

4949
<Input type='text' label='Member groups of the appProf' ref='endpointGroups' defaultValue={obj.endpointGroups} placeholder='Member groups of the appProf' />
5050

51-
<Input type='text' label='Network of App Prof' ref='networkName' defaultValue={obj.networkName} placeholder='Network of App Prof' />
52-
5351
<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
5452

5553
</div>

‎client/contivModelClient.go

+12-15
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ type AppProfile struct {
152152

153153
AppProfileName string `json:"appProfileName,omitempty"` // Application Profile Name
154154
EndpointGroups []string `json:"endpointGroups,omitempty"`
155-
NetworkName string `json:"networkName,omitempty"` // Network of App Prof
156-
TenantName string `json:"tenantName,omitempty"` // Tenant Name
155+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
157156

158157
// add link-sets and links
159158
LinkSets AppProfileLinkSets `json:"link-sets,omitempty"`
@@ -165,8 +164,7 @@ type AppProfileLinkSets struct {
165164
}
166165

167166
type AppProfileLinks struct {
168-
Network Link `json:"Network,omitempty"`
169-
Tenant Link `json:"Tenant,omitempty"`
167+
Tenant Link `json:"Tenant,omitempty"`
170168
}
171169

172170
type Bgp struct {
@@ -237,7 +235,6 @@ type Network struct {
237235
}
238236

239237
type NetworkLinkSets struct {
240-
AppProfiles map[string]Link `json:"AppProfiles,omitempty"`
241238
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
242239
Servicelbs map[string]Link `json:"Servicelbs,omitempty"`
243240
Services map[string]Link `json:"Services,omitempty"`
@@ -386,7 +383,7 @@ type VolumeProfileLinks struct {
386383
// AppProfilePost posts the appProfile object
387384
func (c *ContivClient) AppProfilePost(obj *AppProfile) error {
388385
// build key and URL
389-
keyStr := obj.TenantName + ":" + obj.NetworkName + ":" + obj.AppProfileName
386+
keyStr := obj.TenantName + ":" + obj.AppProfileName
390387
url := c.baseURL + "/api/appProfiles/" + keyStr + "/"
391388

392389
// http post the object
@@ -416,9 +413,9 @@ func (c *ContivClient) AppProfileList() (*[]*AppProfile, error) {
416413
}
417414

418415
// AppProfileGet gets the appProfile object
419-
func (c *ContivClient) AppProfileGet(tenantName string, networkName string, appProfileName string) (*AppProfile, error) {
416+
func (c *ContivClient) AppProfileGet(tenantName string, appProfileName string) (*AppProfile, error) {
420417
// build key and URL
421-
keyStr := tenantName + ":" + networkName + ":" + appProfileName
418+
keyStr := tenantName + ":" + appProfileName
422419
url := c.baseURL + "/api/appProfiles/" + keyStr + "/"
423420

424421
// http get the object
@@ -433,9 +430,9 @@ func (c *ContivClient) AppProfileGet(tenantName string, networkName string, appP
433430
}
434431

435432
// AppProfileDelete deletes the appProfile object
436-
func (c *ContivClient) AppProfileDelete(tenantName string, networkName string, appProfileName string) error {
433+
func (c *ContivClient) AppProfileDelete(tenantName string, appProfileName string) error {
437434
// build key and URL
438-
keyStr := tenantName + ":" + networkName + ":" + appProfileName
435+
keyStr := tenantName + ":" + appProfileName
439436
url := c.baseURL + "/api/appProfiles/" + keyStr + "/"
440437

441438
// http get the object
@@ -516,7 +513,7 @@ func (c *ContivClient) BgpDelete(hostname string) error {
516513
// EndpointGroupPost posts the endpointGroup object
517514
func (c *ContivClient) EndpointGroupPost(obj *EndpointGroup) error {
518515
// build key and URL
519-
keyStr := obj.TenantName + ":" + obj.NetworkName + ":" + obj.GroupName
516+
keyStr := obj.TenantName + ":" + obj.GroupName
520517
url := c.baseURL + "/api/endpointGroups/" + keyStr + "/"
521518

522519
// http post the object
@@ -546,9 +543,9 @@ func (c *ContivClient) EndpointGroupList() (*[]*EndpointGroup, error) {
546543
}
547544

548545
// EndpointGroupGet gets the endpointGroup object
549-
func (c *ContivClient) EndpointGroupGet(tenantName string, networkName string, groupName string) (*EndpointGroup, error) {
546+
func (c *ContivClient) EndpointGroupGet(tenantName string, groupName string) (*EndpointGroup, error) {
550547
// build key and URL
551-
keyStr := tenantName + ":" + networkName + ":" + groupName
548+
keyStr := tenantName + ":" + groupName
552549
url := c.baseURL + "/api/endpointGroups/" + keyStr + "/"
553550

554551
// http get the object
@@ -563,9 +560,9 @@ func (c *ContivClient) EndpointGroupGet(tenantName string, networkName string, g
563560
}
564561

565562
// EndpointGroupDelete deletes the endpointGroup object
566-
func (c *ContivClient) EndpointGroupDelete(tenantName string, networkName string, groupName string) error {
563+
func (c *ContivClient) EndpointGroupDelete(tenantName string, groupName string) error {
567564
// build key and URL
568-
keyStr := tenantName + ":" + networkName + ":" + groupName
565+
keyStr := tenantName + ":" + groupName
569566
url := c.baseURL + "/api/endpointGroups/" + keyStr + "/"
570567

571568
// http get the object

‎client/contivModelClient.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,11 @@ def __init__(self, baseUrl):
7474
self.baseUrl = baseUrl
7575
# Create appProfile
7676
def createAppProfile(self, obj):
77-
postUrl = self.baseUrl + '/api/appProfiles/' + obj.tenantName + ":" + obj.networkName + ":" + obj.appProfileName + '/'
77+
postUrl = self.baseUrl + '/api/appProfiles/' + obj.tenantName + ":" + obj.appProfileName + '/'
7878

7979
jdata = json.dumps({
8080
"appProfileName": obj.appProfileName,
8181
"endpointGroups": obj.endpointGroups,
82-
"networkName": obj.networkName,
8382
"tenantName": obj.tenantName,
8483
})
8584

@@ -90,9 +89,9 @@ def createAppProfile(self, obj):
9089
errorExit("AppProfile create failure")
9190

9291
# Delete appProfile
93-
def deleteAppProfile(self, tenantName, networkName, appProfileName):
92+
def deleteAppProfile(self, tenantName, appProfileName):
9493
# Delete AppProfile
95-
deleteUrl = self.baseUrl + '/api/appProfiles/' + tenantName + ":" + networkName + ":" + appProfileName + '/'
94+
deleteUrl = self.baseUrl + '/api/appProfiles/' + tenantName + ":" + appProfileName + '/'
9695
response = httpDelete(deleteUrl)
9796

9897
if response == "Error":
@@ -143,7 +142,7 @@ def listBgp(self):
143142
return json.loads(retData)
144143
# Create endpointGroup
145144
def createEndpointGroup(self, obj):
146-
postUrl = self.baseUrl + '/api/endpointGroups/' + obj.tenantName + ":" + obj.networkName + ":" + obj.groupName + '/'
145+
postUrl = self.baseUrl + '/api/endpointGroups/' + obj.tenantName + ":" + obj.groupName + '/'
147146

148147
jdata = json.dumps({
149148
"groupName": obj.groupName,
@@ -159,9 +158,9 @@ def createEndpointGroup(self, obj):
159158
errorExit("EndpointGroup create failure")
160159

161160
# Delete endpointGroup
162-
def deleteEndpointGroup(self, tenantName, networkName, groupName):
161+
def deleteEndpointGroup(self, tenantName, groupName):
163162
# Delete EndpointGroup
164-
deleteUrl = self.baseUrl + '/api/endpointGroups/' + tenantName + ":" + networkName + ":" + groupName + '/'
163+
deleteUrl = self.baseUrl + '/api/endpointGroups/' + tenantName + ":" + groupName + '/'
165164
response = httpDelete(deleteUrl)
166165

167166
if response == "Error":

‎contivModel.go

+4-16
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ type AppProfile struct {
2121

2222
AppProfileName string `json:"appProfileName,omitempty"` // Application Profile Name
2323
EndpointGroups []string `json:"endpointGroups,omitempty"`
24-
NetworkName string `json:"networkName,omitempty"` // Network of App Prof
25-
TenantName string `json:"tenantName,omitempty"` // Tenant Name
24+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
2625

2726
// add link-sets and links
2827
LinkSets AppProfileLinkSets `json:"link-sets,omitempty"`
@@ -34,8 +33,7 @@ type AppProfileLinkSets struct {
3433
}
3534

3635
type AppProfileLinks struct {
37-
Network modeldb.Link `json:"Network,omitempty"`
38-
Tenant modeldb.Link `json:"Tenant,omitempty"`
36+
Tenant modeldb.Link `json:"Tenant,omitempty"`
3937
}
4038

4139
type Bgp struct {
@@ -106,7 +104,6 @@ type Network struct {
106104
}
107105

108106
type NetworkLinkSets struct {
109-
AppProfiles map[string]modeldb.Link `json:"AppProfiles,omitempty"`
110107
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
111108
Servicelbs map[string]modeldb.Link `json:"Servicelbs,omitempty"`
112109
Services map[string]modeldb.Link `json:"Services,omitempty"`
@@ -800,7 +797,7 @@ func restoreAppProfile() error {
800797
// Validate a appProfile object
801798
func ValidateAppProfile(obj *AppProfile) error {
802799
// Validate key is correct
803-
keyStr := obj.TenantName + ":" + obj.NetworkName + ":" + obj.AppProfileName
800+
keyStr := obj.TenantName + ":" + obj.AppProfileName
804801
if obj.Key != keyStr {
805802
log.Errorf("Expecting AppProfile Key: %s. Got: %s", keyStr, obj.Key)
806803
return errors.New("Invalid Key")
@@ -817,15 +814,6 @@ func ValidateAppProfile(obj *AppProfile) error {
817814
return errors.New("appProfileName string invalid format")
818815
}
819816

820-
if len(obj.NetworkName) > 64 {
821-
return errors.New("networkName string too long")
822-
}
823-
824-
networkNameMatch := regexp.MustCompile("^(([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])$")
825-
if networkNameMatch.MatchString(obj.NetworkName) == false {
826-
return errors.New("networkName string invalid format")
827-
}
828-
829817
if len(obj.TenantName) > 64 {
830818
return errors.New("tenantName string too long")
831819
}
@@ -1340,7 +1328,7 @@ func restoreEndpointGroup() error {
13401328
// Validate a endpointGroup object
13411329
func ValidateEndpointGroup(obj *EndpointGroup) error {
13421330
// Validate key is correct
1343-
keyStr := obj.TenantName + ":" + obj.NetworkName + ":" + obj.GroupName
1331+
keyStr := obj.TenantName + ":" + obj.GroupName
13441332
if obj.Key != keyStr {
13451333
log.Errorf("Expecting EndpointGroup Key: %s. Got: %s", keyStr, obj.Key)
13461334
return errors.New("Invalid Key")

‎endpointGroup.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"name": "endpointGroup",
66
"type": "object",
7-
"key": [ "tenantName", "networkName", "groupName" ],
7+
"key": [ "tenantName", "groupName" ],
88
"properties": {
99
"groupName": {
1010
"type": "string",

‎network.json

-3
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@
6767
"services": {
6868
"ref": "service"
6969
},
70-
"appProfiles": {
71-
"ref": "appProfile"
72-
},
7370
"endpointGroups": {
7471
"ref": "endpointGroup"
7572
},

0 commit comments

Comments
 (0)