Skip to content

Commit 5d42fe7

Browse files
author
Vipin Jain
committed
rebase to latest
1 parent 28d422b commit 5d42fe7

File tree

2 files changed

+184
-0
lines changed

2 files changed

+184
-0
lines changed

‎client/contivModelClient.go

+88
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,17 @@ type AppProfile struct {
154154
EndpointGroups []string `json:"endpointGroups,omitempty"`
155155
TenantName string `json:"tenantName,omitempty"` // Tenant Name
156156

157+
// add link-sets and links
158+
LinkSets AppProfileLinkSets `json:"link-sets,omitempty"`
159+
Links AppProfileLinks `json:"links,omitempty"`
160+
}
161+
162+
type AppProfileLinkSets struct {
163+
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
164+
}
165+
166+
type AppProfileLinks struct {
167+
Tenant Link `json:"Tenant,omitempty"`
157168
}
158169

159170
type AppProfileInspect struct {
@@ -197,6 +208,12 @@ type EndpointGroupLinkSets struct {
197208
Services map[string]Link `json:"Services,omitempty"`
198209
}
199210

211+
type EndpointGroupLinks struct {
212+
AppProfile Link `json:"AppProfile,omitempty"`
213+
Network Link `json:"Network,omitempty"`
214+
Tenant Link `json:"Tenant,omitempty"`
215+
}
216+
200217
type EndpointGroupInspect struct {
201218
Config EndpointGroup
202219
}
@@ -247,6 +264,19 @@ type Network struct {
247264
Subnet string `json:"subnet,omitempty"` // Subnet
248265
TenantName string `json:"tenantName,omitempty"` // Tenant Name
249266

267+
// add link-sets and links
268+
LinkSets NetworkLinkSets `json:"link-sets,omitempty"`
269+
Links NetworkLinks `json:"links,omitempty"`
270+
}
271+
272+
type NetworkLinkSets struct {
273+
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
274+
Servicelbs map[string]Link `json:"Servicelbs,omitempty"`
275+
Services map[string]Link `json:"Services,omitempty"`
276+
}
277+
278+
type NetworkLinks struct {
279+
Tenant Link `json:"Tenant,omitempty"`
250280
}
251281

252282
type NetworkInspect struct {
@@ -260,6 +290,18 @@ type Policy struct {
260290
PolicyName string `json:"policyName,omitempty"` // Policy Name
261291
TenantName string `json:"tenantName,omitempty"` // Tenant Name
262292

293+
// add link-sets and links
294+
LinkSets PolicyLinkSets `json:"link-sets,omitempty"`
295+
Links PolicyLinks `json:"links,omitempty"`
296+
}
297+
298+
type PolicyLinkSets struct {
299+
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
300+
Rules map[string]Link `json:"Rules,omitempty"`
301+
}
302+
303+
type PolicyLinks struct {
304+
Tenant Link `json:"Tenant,omitempty"`
263305
}
264306

265307
type PolicyInspect struct {
@@ -285,6 +327,12 @@ type Rule struct {
285327
ToIpAddress string `json:"toIpAddress,omitempty"` // IP Address
286328
ToNetwork string `json:"toNetwork,omitempty"` // To Network
287329

330+
// add link-sets and links
331+
LinkSets RuleLinkSets `json:"link-sets,omitempty"`
332+
}
333+
334+
type RuleLinkSets struct {
335+
Policies map[string]Link `json:"Policies,omitempty"`
288336
}
289337

290338
type RuleInspect struct {
@@ -302,6 +350,12 @@ type ServiceLB struct {
302350
ServiceName string `json:"serviceName,omitempty"` // service name
303351
TenantName string `json:"tenantName,omitempty"` // Tenant Name
304352

353+
Links ServiceLBLinks `json:"links,omitempty"`
354+
}
355+
356+
type ServiceLBLinks struct {
357+
Network Link `json:"Network,omitempty"`
358+
Tenant Link `json:"Tenant,omitempty"`
305359
}
306360

307361
type ServiceLBInspect struct {
@@ -315,6 +369,18 @@ type Tenant struct {
315369
DefaultNetwork string `json:"defaultNetwork,omitempty"` // Network name
316370
TenantName string `json:"tenantName,omitempty"` // Tenant Name
317371

372+
// add link-sets and links
373+
LinkSets TenantLinkSets `json:"link-sets,omitempty"`
374+
}
375+
376+
type TenantLinkSets struct {
377+
AppProfiles map[string]Link `json:"AppProfiles,omitempty"`
378+
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
379+
Networks map[string]Link `json:"Networks,omitempty"`
380+
Policies map[string]Link `json:"Policies,omitempty"`
381+
Servicelbs map[string]Link `json:"Servicelbs,omitempty"`
382+
VolumeProfiles map[string]Link `json:"VolumeProfiles,omitempty"`
383+
Volumes map[string]Link `json:"Volumes,omitempty"`
318384
}
319385

320386
type TenantInspect struct {
@@ -332,6 +398,17 @@ type Volume struct {
332398
TenantName string `json:"tenantName,omitempty"` // Tenant Name
333399
VolumeName string `json:"volumeName,omitempty"` // Volume Name
334400

401+
// add link-sets and links
402+
LinkSets VolumeLinkSets `json:"link-sets,omitempty"`
403+
Links VolumeLinks `json:"links,omitempty"`
404+
}
405+
406+
type VolumeLinkSets struct {
407+
ServiceInstances map[string]Link `json:"ServiceInstances,omitempty"`
408+
}
409+
410+
type VolumeLinks struct {
411+
Tenant Link `json:"Tenant,omitempty"`
335412
}
336413

337414
type VolumeInspect struct {
@@ -349,6 +426,17 @@ type VolumeProfile struct {
349426
TenantName string `json:"tenantName,omitempty"` // Tenant Name
350427
VolumeProfileName string `json:"volumeProfileName,omitempty"` // Volume profile Name
351428

429+
// add link-sets and links
430+
LinkSets VolumeProfileLinkSets `json:"link-sets,omitempty"`
431+
Links VolumeProfileLinks `json:"links,omitempty"`
432+
}
433+
434+
type VolumeProfileLinkSets struct {
435+
Services map[string]Link `json:"Services,omitempty"`
436+
}
437+
438+
type VolumeProfileLinks struct {
439+
Tenant Link `json:"Tenant,omitempty"`
352440
}
353441

354442
type VolumeProfileInspect struct {

‎contivModel.go

+96
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@ type AppProfile struct {
2323
EndpointGroups []string `json:"endpointGroups,omitempty"`
2424
TenantName string `json:"tenantName,omitempty"` // Tenant Name
2525

26+
// add link-sets and links
27+
LinkSets AppProfileLinkSets `json:"link-sets,omitempty"`
28+
Links AppProfileLinks `json:"links,omitempty"`
29+
}
30+
31+
type AppProfileLinkSets struct {
32+
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
33+
}
34+
35+
type AppProfileLinks struct {
36+
Tenant modeldb.Link `json:"Tenant,omitempty"`
2637
}
2738

2839
type AppProfileInspect struct {
@@ -53,6 +64,20 @@ type EndpointGroup struct {
5364
Policies []string `json:"policies,omitempty"`
5465
TenantName string `json:"tenantName,omitempty"` // Tenant
5566

67+
// add link-sets and links
68+
LinkSets EndpointGroupLinkSets `json:"link-sets,omitempty"`
69+
Links EndpointGroupLinks `json:"links,omitempty"`
70+
}
71+
72+
type EndpointGroupLinkSets struct {
73+
Policies map[string]modeldb.Link `json:"Policies,omitempty"`
74+
Services map[string]modeldb.Link `json:"Services,omitempty"`
75+
}
76+
77+
type EndpointGroupLinks struct {
78+
AppProfile modeldb.Link `json:"AppProfile,omitempty"`
79+
Network modeldb.Link `json:"Network,omitempty"`
80+
Tenant modeldb.Link `json:"Tenant,omitempty"`
5681
}
5782

5883
type EndpointGroupLinkSets struct {
@@ -116,6 +141,19 @@ type Network struct {
116141
Subnet string `json:"subnet,omitempty"` // Subnet
117142
TenantName string `json:"tenantName,omitempty"` // Tenant Name
118143

144+
// add link-sets and links
145+
LinkSets NetworkLinkSets `json:"link-sets,omitempty"`
146+
Links NetworkLinks `json:"links,omitempty"`
147+
}
148+
149+
type NetworkLinkSets struct {
150+
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
151+
Servicelbs map[string]modeldb.Link `json:"Servicelbs,omitempty"`
152+
Services map[string]modeldb.Link `json:"Services,omitempty"`
153+
}
154+
155+
type NetworkLinks struct {
156+
Tenant modeldb.Link `json:"Tenant,omitempty"`
119157
}
120158

121159
type NetworkInspect struct {
@@ -128,6 +166,18 @@ type Policy struct {
128166
PolicyName string `json:"policyName,omitempty"` // Policy Name
129167
TenantName string `json:"tenantName,omitempty"` // Tenant Name
130168

169+
// add link-sets and links
170+
LinkSets PolicyLinkSets `json:"link-sets,omitempty"`
171+
Links PolicyLinks `json:"links,omitempty"`
172+
}
173+
174+
type PolicyLinkSets struct {
175+
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
176+
Rules map[string]modeldb.Link `json:"Rules,omitempty"`
177+
}
178+
179+
type PolicyLinks struct {
180+
Tenant modeldb.Link `json:"Tenant,omitempty"`
131181
}
132182

133183
type PolicyInspect struct {
@@ -152,6 +202,12 @@ type Rule struct {
152202
ToIpAddress string `json:"toIpAddress,omitempty"` // IP Address
153203
ToNetwork string `json:"toNetwork,omitempty"` // To Network
154204

205+
// add link-sets and links
206+
LinkSets RuleLinkSets `json:"link-sets,omitempty"`
207+
}
208+
209+
type RuleLinkSets struct {
210+
Policies map[string]modeldb.Link `json:"Policies,omitempty"`
155211
}
156212

157213
type RuleInspect struct {
@@ -168,6 +224,12 @@ type ServiceLB struct {
168224
ServiceName string `json:"serviceName,omitempty"` // service name
169225
TenantName string `json:"tenantName,omitempty"` // Tenant Name
170226

227+
Links ServiceLBLinks `json:"links,omitempty"`
228+
}
229+
230+
type ServiceLBLinks struct {
231+
Network modeldb.Link `json:"Network,omitempty"`
232+
Tenant modeldb.Link `json:"Tenant,omitempty"`
171233
}
172234

173235
type ServiceLBInspect struct {
@@ -180,6 +242,18 @@ type Tenant struct {
180242
DefaultNetwork string `json:"defaultNetwork,omitempty"` // Network name
181243
TenantName string `json:"tenantName,omitempty"` // Tenant Name
182244

245+
// add link-sets and links
246+
LinkSets TenantLinkSets `json:"link-sets,omitempty"`
247+
}
248+
249+
type TenantLinkSets struct {
250+
AppProfiles map[string]modeldb.Link `json:"AppProfiles,omitempty"`
251+
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
252+
Networks map[string]modeldb.Link `json:"Networks,omitempty"`
253+
Policies map[string]modeldb.Link `json:"Policies,omitempty"`
254+
Servicelbs map[string]modeldb.Link `json:"Servicelbs,omitempty"`
255+
VolumeProfiles map[string]modeldb.Link `json:"VolumeProfiles,omitempty"`
256+
Volumes map[string]modeldb.Link `json:"Volumes,omitempty"`
183257
}
184258

185259
type TenantInspect struct {
@@ -196,6 +270,17 @@ type Volume struct {
196270
TenantName string `json:"tenantName,omitempty"` // Tenant Name
197271
VolumeName string `json:"volumeName,omitempty"` // Volume Name
198272

273+
// add link-sets and links
274+
LinkSets VolumeLinkSets `json:"link-sets,omitempty"`
275+
Links VolumeLinks `json:"links,omitempty"`
276+
}
277+
278+
type VolumeLinkSets struct {
279+
ServiceInstances map[string]modeldb.Link `json:"ServiceInstances,omitempty"`
280+
}
281+
282+
type VolumeLinks struct {
283+
Tenant modeldb.Link `json:"Tenant,omitempty"`
199284
}
200285

201286
type VolumeInspect struct {
@@ -212,6 +297,17 @@ type VolumeProfile struct {
212297
TenantName string `json:"tenantName,omitempty"` // Tenant Name
213298
VolumeProfileName string `json:"volumeProfileName,omitempty"` // Volume profile Name
214299

300+
// add link-sets and links
301+
LinkSets VolumeProfileLinkSets `json:"link-sets,omitempty"`
302+
Links VolumeProfileLinks `json:"links,omitempty"`
303+
}
304+
305+
type VolumeProfileLinkSets struct {
306+
Services map[string]modeldb.Link `json:"Services,omitempty"`
307+
}
308+
309+
type VolumeProfileLinks struct {
310+
Tenant modeldb.Link `json:"Tenant,omitempty"`
215311
}
216312

217313
type VolumeProfileInspect struct {

0 commit comments

Comments
 (0)