Skip to content

Commit 2ee80bd

Browse files
author
jojimt
committed
Change app to appProfile
1 parent 9c4fa80 commit 2ee80bd

9 files changed

+226
-192
lines changed

‎app.json

-30
This file was deleted.

‎appProfile.json

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"name": "contivModel",
3+
"objects": [
4+
{
5+
"name": "appProfile",
6+
"type": "object",
7+
"key": [ "tenantName", "networkName", "appProfileName" ],
8+
"properties": {
9+
"appProfileName": {
10+
"type": "string",
11+
"title": "Application Profile Name"
12+
},
13+
"endpointGroups": {
14+
"type": "array",
15+
"items": "string",
16+
"title": "Member groups of the appProf"
17+
},
18+
"networkName": {
19+
"type": "string",
20+
"title": "Network of App Prof"
21+
},
22+
"tenantName": {
23+
"type": "string",
24+
"title": "Tenant Name"
25+
}
26+
},
27+
"link-sets": {
28+
"endpointGroups": {
29+
"ref": "endpointGroup"
30+
}
31+
},
32+
"links": {
33+
"tenant": {
34+
"ref": "tenant"
35+
},
36+
"network": {
37+
"ref": "network"
38+
}
39+
}
40+
}
41+
]
42+
}

‎client/contivModel.js

+17-13
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
// This file is auto generated by modelgen tool
33
// Do not edit this file manually
44

5-
var AppSummaryView = React.createClass({
5+
var AppProfileSummaryView = React.createClass({
66
render: function() {
77
var self = this
88

99
// Walk thru all objects
10-
var appListView = self.props.apps.map(function(app){
10+
var appProfileListView = self.props.appProfiles.map(function(appProfile){
1111
return (
12-
<ModalTrigger modal={<AppModalView app={ app }/>}>
13-
<tr key={ app.key } className="info">
12+
<ModalTrigger modal={<AppProfileModalView appProfile={ appProfile }/>}>
13+
<tr key={ appProfile.key } className="info">
1414

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

27-
27+
2828
</tr>
2929
</thead>
3030
<tbody>
31-
{ appListView }
31+
{ appProfileListView }
3232
</tbody>
3333
</Table>
3434
</div>
3535
);
3636
}
3737
});
3838

39-
var AppModalView = React.createClass({
39+
var AppProfileModalView = React.createClass({
4040
render() {
41-
var obj = this.props.app
41+
var obj = this.props.appProfile
4242
return (
43-
<Modal {...this.props} bsStyle='primary' bsSize='large' title='App' animation={false}>
43+
<Modal {...this.props} bsStyle='primary' bsSize='large' title='AppProfile' animation={false}>
4444
<div className='modal-body' style={ {margin: '5%',} }>
4545

4646

47-
<Input type='text' label='Application Name' ref='appName' defaultValue={obj.appName} placeholder='Application Name' />
47+
<Input type='text' label='Application Profile Name' ref='appProfileName' defaultValue={obj.appProfileName} placeholder='Application Profile Name' />
48+
49+
<Input type='text' label='Member groups of the appProf' ref='endpointGroups' defaultValue={obj.endpointGroups} placeholder='Member groups of the appProf' />
50+
51+
<Input type='text' label='Network of App Prof' ref='networkName' defaultValue={obj.networkName} placeholder='Network of App Prof' />
4852

4953
<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
5054

@@ -57,8 +61,8 @@ var AppModalView = React.createClass({
5761
}
5862
});
5963

60-
module.exports.AppSummaryView = AppSummaryView
61-
module.exports.AppModalView = AppModalView
64+
module.exports.AppProfileSummaryView = AppProfileSummaryView
65+
module.exports.AppProfileModalView = AppProfileModalView
6266
var EndpointGroupSummaryView = React.createClass({
6367
render: function() {
6468
var self = this

‎client/contivModelClient.go

+38-33
Original file line numberDiff line numberDiff line change
@@ -142,24 +142,27 @@ func NewContivClient(baseURL string) (*ContivClient, error) {
142142
return &client, nil
143143
}
144144

145-
type App struct {
145+
type AppProfile struct {
146146
// every object has a key
147147
Key string `json:"key,omitempty"`
148148

149-
AppName string `json:"appName,omitempty"` // Application Name
150-
TenantName string `json:"tenantName,omitempty"` // Tenant Name
149+
AppProfileName string `json:"appProfileName,omitempty"` // Application Profile Name
150+
EndpointGroups []string `json:"endpointGroups,omitempty"`
151+
NetworkName string `json:"networkName,omitempty"` // Network of App Prof
152+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
151153

152154
// add link-sets and links
153-
LinkSets AppLinkSets `json:"link-sets,omitempty"`
154-
Links AppLinks `json:"links,omitempty"`
155+
LinkSets AppProfileLinkSets `json:"link-sets,omitempty"`
156+
Links AppProfileLinks `json:"links,omitempty"`
155157
}
156158

157-
type AppLinkSets struct {
158-
Services map[string]modeldb.Link `json:"Services,omitempty"`
159+
type AppProfileLinkSets struct {
160+
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
159161
}
160162

161-
type AppLinks struct {
162-
Tenant modeldb.Link `json:"Tenant,omitempty"`
163+
type AppProfileLinks struct {
164+
Network modeldb.Link `json:"Network,omitempty"`
165+
Tenant modeldb.Link `json:"Tenant,omitempty"`
163166
}
164167

165168
type EndpointGroup struct {
@@ -183,8 +186,9 @@ type EndpointGroupLinkSets struct {
183186
}
184187

185188
type EndpointGroupLinks struct {
186-
Network modeldb.Link `json:"Network,omitempty"`
187-
Tenant modeldb.Link `json:"Tenant,omitempty"`
189+
AppProfile modeldb.Link `json:"AppProfile,omitempty"`
190+
Network modeldb.Link `json:"Network,omitempty"`
191+
Tenant modeldb.Link `json:"Tenant,omitempty"`
188192
}
189193

190194
type Global struct {
@@ -227,6 +231,7 @@ type Network struct {
227231
}
228232

229233
type NetworkLinkSets struct {
234+
AppProfiles map[string]modeldb.Link `json:"AppProfiles,omitempty"`
230235
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
231236
Services map[string]modeldb.Link `json:"Services,omitempty"`
232237
}
@@ -351,7 +356,7 @@ type Tenant struct {
351356
}
352357

353358
type TenantLinkSets struct {
354-
Apps map[string]modeldb.Link `json:"Apps,omitempty"`
359+
AppProfiles map[string]modeldb.Link `json:"AppProfiles,omitempty"`
355360
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
356361
Networks map[string]modeldb.Link `json:"Networks,omitempty"`
357362
Policies map[string]modeldb.Link `json:"Policies,omitempty"`
@@ -407,65 +412,65 @@ type VolumeProfileLinks struct {
407412
Tenant modeldb.Link `json:"Tenant,omitempty"`
408413
}
409414

410-
// AppPost posts the app object
411-
func (c *ContivClient) AppPost(obj *App) error {
415+
// AppProfilePost posts the appProfile object
416+
func (c *ContivClient) AppProfilePost(obj *AppProfile) error {
412417
// build key and URL
413-
keyStr := obj.TenantName + ":" + obj.AppName
414-
url := c.baseURL + "/api/apps/" + keyStr + "/"
418+
keyStr := obj.TenantName + ":" + obj.NetworkName + ":" + obj.AppProfileName
419+
url := c.baseURL + "/api/appProfiles/" + keyStr + "/"
415420

416421
// http post the object
417422
err := httpPost(url, obj)
418423
if err != nil {
419-
log.Debugf("Error creating app %+v. Err: %v", obj, err)
424+
log.Debugf("Error creating appProfile %+v. Err: %v", obj, err)
420425
return err
421426
}
422427

423428
return nil
424429
}
425430

426-
// AppList lists all app objects
427-
func (c *ContivClient) AppList() (*[]*App, error) {
431+
// AppProfileList lists all appProfile objects
432+
func (c *ContivClient) AppProfileList() (*[]*AppProfile, error) {
428433
// build key and URL
429-
url := c.baseURL + "/api/apps/"
434+
url := c.baseURL + "/api/appProfiles/"
430435

431436
// http get the object
432-
var objList []*App
437+
var objList []*AppProfile
433438
err := httpGet(url, &objList)
434439
if err != nil {
435-
log.Debugf("Error getting apps. Err: %v", err)
440+
log.Debugf("Error getting appProfiles. Err: %v", err)
436441
return nil, err
437442
}
438443

439444
return &objList, nil
440445
}
441446

442-
// AppGet gets the app object
443-
func (c *ContivClient) AppGet(tenantName string, appName string) (*App, error) {
447+
// AppProfileGet gets the appProfile object
448+
func (c *ContivClient) AppProfileGet(tenantName string, networkName string, appProfileName string) (*AppProfile, error) {
444449
// build key and URL
445-
keyStr := tenantName + ":" + appName
446-
url := c.baseURL + "/api/apps/" + keyStr + "/"
450+
keyStr := tenantName + ":" + networkName + ":" + appProfileName
451+
url := c.baseURL + "/api/appProfiles/" + keyStr + "/"
447452

448453
// http get the object
449-
var obj App
454+
var obj AppProfile
450455
err := httpGet(url, &obj)
451456
if err != nil {
452-
log.Debugf("Error getting app %+v. Err: %v", keyStr, err)
457+
log.Debugf("Error getting appProfile %+v. Err: %v", keyStr, err)
453458
return nil, err
454459
}
455460

456461
return &obj, nil
457462
}
458463

459-
// AppDelete deletes the app object
460-
func (c *ContivClient) AppDelete(tenantName string, appName string) error {
464+
// AppProfileDelete deletes the appProfile object
465+
func (c *ContivClient) AppProfileDelete(tenantName string, networkName string, appProfileName string) error {
461466
// build key and URL
462-
keyStr := tenantName + ":" + appName
463-
url := c.baseURL + "/api/apps/" + keyStr + "/"
467+
keyStr := tenantName + ":" + networkName + ":" + appProfileName
468+
url := c.baseURL + "/api/appProfiles/" + keyStr + "/"
464469

465470
// http get the object
466471
err := httpDelete(url)
467472
if err != nil {
468-
log.Debugf("Error deleting app %s. Err: %v", keyStr, err)
473+
log.Debugf("Error deleting appProfile %s. Err: %v", keyStr, err)
469474
return err
470475
}
471476

‎client/contivModelClient.py

+17-15
Original file line numberDiff line numberDiff line change
@@ -72,36 +72,38 @@ def httpGet(url):
7272
class objmodelClient:
7373
def __init__(self, baseUrl):
7474
self.baseUrl = baseUrl
75-
# Create app
76-
def createApp(self, obj):
77-
postUrl = self.baseUrl + '/api/Apps/' + obj.tenantName + ":" + obj.appName + '/'
75+
# Create appProfile
76+
def createAppProfile(self, obj):
77+
postUrl = self.baseUrl + '/api/AppProfiles/' + obj.tenantName + ":" + obj.networkName + ":" + obj.appProfileName + '/'
7878

7979
jdata = json.dumps({
80-
"appName": obj.appName,
80+
"appProfileName": obj.appProfileName,
81+
"endpointGroups": obj.endpointGroups,
82+
"networkName": obj.networkName,
8183
"tenantName": obj.tenantName,
8284
})
8385

8486
# Post the data
8587
response = httpPost(postUrl, jdata)
8688

8789
if response == "Error":
88-
errorExit("App create failure")
90+
errorExit("AppProfile create failure")
8991

90-
# Delete app
91-
def deleteApp(self, tenantName, appName):
92-
# Delete App
93-
deleteUrl = self.baseUrl + '/api/apps/' + tenantName + ":" + appName + '/'
92+
# Delete appProfile
93+
def deleteAppProfile(self, tenantName, networkName, appProfileName):
94+
# Delete AppProfile
95+
deleteUrl = self.baseUrl + '/api/appProfiles/' + tenantName + ":" + networkName + ":" + appProfileName + '/'
9496
response = httpDelete(deleteUrl)
9597

9698
if response == "Error":
97-
errorExit("App create failure")
99+
errorExit("AppProfile create failure")
98100

99-
# List all app objects
100-
def listApp(self):
101-
# Get a list of app objects
102-
retDate = urllib2.urlopen(self.baseUrl + '/api/apps/')
101+
# List all appProfile objects
102+
def listAppProfile(self):
103+
# Get a list of appProfile objects
104+
retDate = urllib2.urlopen(self.baseUrl + '/api/appProfiles/')
103105
if retData == "Error":
104-
errorExit("list App failed")
106+
errorExit("list AppProfile failed")
105107

106108
return json.loads(retData)
107109
# Create endpointGroup

0 commit comments

Comments
 (0)