Skip to content
This repository was archived by the owner on Nov 29, 2017. It is now read-only.

Commit 701bcef

Browse files
abhiabhi
committed
service load balancer
service load balance service load balancer
1 parent 1d248ed commit 701bcef

5 files changed

+581
-134
lines changed

‎client/contivModel.js

+65
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,71 @@ var ServiceInstanceModalView = React.createClass({
676676

677677
module.exports.ServiceInstanceSummaryView = ServiceInstanceSummaryView
678678
module.exports.ServiceInstanceModalView = ServiceInstanceModalView
679+
var ServiceLBSummaryView = React.createClass({
680+
render: function() {
681+
var self = this
682+
683+
// Walk thru all objects
684+
var serviceLBListView = self.props.serviceLBs.map(function(serviceLB){
685+
return (
686+
<ModalTrigger modal={<ServiceLBModalView serviceLB={ serviceLB }/>}>
687+
<tr key={ serviceLB.key } className="info">
688+
689+
690+
</tr>
691+
</ModalTrigger>
692+
);
693+
});
694+
695+
return (
696+
<div>
697+
<Table hover>
698+
<thead>
699+
<tr>
700+
701+
702+
</tr>
703+
</thead>
704+
<tbody>
705+
{ serviceLBListView }
706+
</tbody>
707+
</Table>
708+
</div>
709+
);
710+
}
711+
});
712+
713+
var ServiceLBModalView = React.createClass({
714+
render() {
715+
var obj = this.props.serviceLB
716+
return (
717+
<Modal {...this.props} bsStyle='primary' bsSize='large' title='ServiceLB' animation={false}>
718+
<div className='modal-body' style={ {margin: '5%',} }>
719+
720+
721+
<Input type='text' label='Service ip' ref='ipAddress' defaultValue={obj.ipAddress} placeholder='Service ip' />
722+
723+
<Input type='text' label='labels key value pair' ref='labels' defaultValue={obj.labels} placeholder='labels key value pair' />
724+
725+
<Input type='text' label='Service subnet' ref='network' defaultValue={obj.network} placeholder='Service subnet' />
726+
727+
<Input type='text' label='service provider port' ref='ports' defaultValue={obj.ports} placeholder='service provider port' />
728+
729+
<Input type='text' label='service name' ref='serviceName' defaultValue={obj.serviceName} placeholder='service name' />
730+
731+
<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
732+
733+
</div>
734+
<div className='modal-footer'>
735+
<Button onClick={this.props.onRequestHide}>Close</Button>
736+
</div>
737+
</Modal>
738+
);
739+
}
740+
});
741+
742+
module.exports.ServiceLBSummaryView = ServiceLBSummaryView
743+
module.exports.ServiceLBModalView = ServiceLBModalView
679744
var TenantSummaryView = React.createClass({
680745
render: function() {
681746
var self = this

‎client/contivModelClient.go

+113-39
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@ import (
1111
"io/ioutil"
1212
"net/http"
1313

14+
"github.com/contiv/objdb/modeldb"
15+
1416
log "github.com/Sirupsen/logrus"
1517
)
1618

17-
// Link is a one way relattion between two objects
18-
type Link struct {
19-
ObjType string `json:"type,omitempty"`
20-
ObjKey string `json:"key,omitempty"`
21-
}
22-
2319
func httpGet(url string, jdata interface{}) error {
2420

2521
r, err := http.Get(url)
@@ -161,12 +157,12 @@ type AppProfile struct {
161157
}
162158

163159
type AppProfileLinkSets struct {
164-
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
160+
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
165161
}
166162

167163
type AppProfileLinks struct {
168-
Network Link `json:"Network,omitempty"`
169-
Tenant Link `json:"Tenant,omitempty"`
164+
Network modeldb.Link `json:"Network,omitempty"`
165+
Tenant modeldb.Link `json:"Tenant,omitempty"`
170166
}
171167

172168
type EndpointGroup struct {
@@ -185,14 +181,14 @@ type EndpointGroup struct {
185181
}
186182

187183
type EndpointGroupLinkSets struct {
188-
Policies map[string]Link `json:"Policies,omitempty"`
189-
Services map[string]Link `json:"Services,omitempty"`
184+
Policies map[string]modeldb.Link `json:"Policies,omitempty"`
185+
Services map[string]modeldb.Link `json:"Services,omitempty"`
190186
}
191187

192188
type EndpointGroupLinks struct {
193-
AppProfile Link `json:"AppProfile,omitempty"`
194-
Network Link `json:"Network,omitempty"`
195-
Tenant 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"`
196192
}
197193

198194
type Global struct {
@@ -236,13 +232,13 @@ type Network struct {
236232
}
237233

238234
type NetworkLinkSets struct {
239-
AppProfiles map[string]Link `json:"AppProfiles,omitempty"`
240-
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
241-
Services map[string]Link `json:"Services,omitempty"`
235+
AppProfiles map[string]modeldb.Link `json:"AppProfiles,omitempty"`
236+
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
237+
Services map[string]modeldb.Link `json:"Services,omitempty"`
242238
}
243239

244240
type NetworkLinks struct {
245-
Tenant Link `json:"Tenant,omitempty"`
241+
Tenant modeldb.Link `json:"Tenant,omitempty"`
246242
}
247243

248244
type Policy struct {
@@ -258,12 +254,12 @@ type Policy struct {
258254
}
259255

260256
type PolicyLinkSets struct {
261-
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
262-
Rules map[string]Link `json:"Rules,omitempty"`
257+
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
258+
Rules map[string]modeldb.Link `json:"Rules,omitempty"`
263259
}
264260

265261
type PolicyLinks struct {
266-
Tenant Link `json:"Tenant,omitempty"`
262+
Tenant modeldb.Link `json:"Tenant,omitempty"`
267263
}
268264

269265
type Rule struct {
@@ -290,7 +286,7 @@ type Rule struct {
290286
}
291287

292288
type RuleLinkSets struct {
293-
Policies map[string]Link `json:"Policies,omitempty"`
289+
Policies map[string]modeldb.Link `json:"Policies,omitempty"`
294290
}
295291

296292
type Service struct {
@@ -316,14 +312,14 @@ type Service struct {
316312
}
317313

318314
type ServiceLinkSets struct {
319-
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
320-
Instances map[string]Link `json:"Instances,omitempty"`
321-
Networks map[string]Link `json:"Networks,omitempty"`
315+
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
316+
Instances map[string]modeldb.Link `json:"Instances,omitempty"`
317+
Networks map[string]modeldb.Link `json:"Networks,omitempty"`
322318
}
323319

324320
type ServiceLinks struct {
325-
App Link `json:"App,omitempty"`
326-
VolumeProfile Link `json:"VolumeProfile,omitempty"`
321+
App modeldb.Link `json:"App,omitempty"`
322+
VolumeProfile modeldb.Link `json:"VolumeProfile,omitempty"`
327323
}
328324

329325
type ServiceInstance struct {
@@ -342,11 +338,24 @@ type ServiceInstance struct {
342338
}
343339

344340
type ServiceInstanceLinkSets struct {
345-
Volumes map[string]Link `json:"Volumes,omitempty"`
341+
Volumes map[string]modeldb.Link `json:"Volumes,omitempty"`
346342
}
347343

348344
type ServiceInstanceLinks struct {
349-
Service Link `json:"Service,omitempty"`
345+
Service modeldb.Link `json:"Service,omitempty"`
346+
}
347+
348+
type ServiceLB struct {
349+
// every object has a key
350+
Key string `json:"key,omitempty"`
351+
352+
IpAddress string `json:"ipAddress,omitempty"` // Service ip
353+
Labels []string `json:"labels,omitempty"`
354+
Network string `json:"network,omitempty"` // Service subnet
355+
Ports []string `json:"ports,omitempty"`
356+
ServiceName string `json:"serviceName,omitempty"` // service name
357+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
358+
350359
}
351360

352361
type Tenant struct {
@@ -361,12 +370,12 @@ type Tenant struct {
361370
}
362371

363372
type TenantLinkSets struct {
364-
AppProfiles map[string]Link `json:"AppProfiles,omitempty"`
365-
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
366-
Networks map[string]Link `json:"Networks,omitempty"`
367-
Policies map[string]Link `json:"Policies,omitempty"`
368-
VolumeProfiles map[string]Link `json:"VolumeProfiles,omitempty"`
369-
Volumes map[string]Link `json:"Volumes,omitempty"`
373+
AppProfiles map[string]modeldb.Link `json:"AppProfiles,omitempty"`
374+
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
375+
Networks map[string]modeldb.Link `json:"Networks,omitempty"`
376+
Policies map[string]modeldb.Link `json:"Policies,omitempty"`
377+
VolumeProfiles map[string]modeldb.Link `json:"VolumeProfiles,omitempty"`
378+
Volumes map[string]modeldb.Link `json:"Volumes,omitempty"`
370379
}
371380

372381
type Volume struct {
@@ -386,11 +395,11 @@ type Volume struct {
386395
}
387396

388397
type VolumeLinkSets struct {
389-
ServiceInstances map[string]Link `json:"ServiceInstances,omitempty"`
398+
ServiceInstances map[string]modeldb.Link `json:"ServiceInstances,omitempty"`
390399
}
391400

392401
type VolumeLinks struct {
393-
Tenant Link `json:"Tenant,omitempty"`
402+
Tenant modeldb.Link `json:"Tenant,omitempty"`
394403
}
395404

396405
type VolumeProfile struct {
@@ -410,11 +419,11 @@ type VolumeProfile struct {
410419
}
411420

412421
type VolumeProfileLinkSets struct {
413-
Services map[string]Link `json:"Services,omitempty"`
422+
Services map[string]modeldb.Link `json:"Services,omitempty"`
414423
}
415424

416425
type VolumeProfileLinks struct {
417-
Tenant Link `json:"Tenant,omitempty"`
426+
Tenant modeldb.Link `json:"Tenant,omitempty"`
418427
}
419428

420429
// AppProfilePost posts the appProfile object
@@ -1002,6 +1011,71 @@ func (c *ContivClient) ServiceInstanceDelete(tenantName string, appName string,
10021011
return nil
10031012
}
10041013

1014+
// ServiceLBPost posts the serviceLB object
1015+
func (c *ContivClient) ServiceLBPost(obj *ServiceLB) error {
1016+
// build key and URL
1017+
keyStr := obj.ServiceName + ":" + obj.TenantName
1018+
url := c.baseURL + "/api/serviceLBs/" + keyStr + "/"
1019+
1020+
// http post the object
1021+
err := httpPost(url, obj)
1022+
if err != nil {
1023+
log.Debugf("Error creating serviceLB %+v. Err: %v", obj, err)
1024+
return err
1025+
}
1026+
1027+
return nil
1028+
}
1029+
1030+
// ServiceLBList lists all serviceLB objects
1031+
func (c *ContivClient) ServiceLBList() (*[]*ServiceLB, error) {
1032+
// build key and URL
1033+
url := c.baseURL + "/api/serviceLBs/"
1034+
1035+
// http get the object
1036+
var objList []*ServiceLB
1037+
err := httpGet(url, &objList)
1038+
if err != nil {
1039+
log.Debugf("Error getting serviceLBs. Err: %v", err)
1040+
return nil, err
1041+
}
1042+
1043+
return &objList, nil
1044+
}
1045+
1046+
// ServiceLBGet gets the serviceLB object
1047+
func (c *ContivClient) ServiceLBGet(serviceName string, tenantName string) (*ServiceLB, error) {
1048+
// build key and URL
1049+
keyStr := serviceName + ":" + tenantName
1050+
url := c.baseURL + "/api/serviceLBs/" + keyStr + "/"
1051+
1052+
// http get the object
1053+
var obj ServiceLB
1054+
err := httpGet(url, &obj)
1055+
if err != nil {
1056+
log.Debugf("Error getting serviceLB %+v. Err: %v", keyStr, err)
1057+
return nil, err
1058+
}
1059+
1060+
return &obj, nil
1061+
}
1062+
1063+
// ServiceLBDelete deletes the serviceLB object
1064+
func (c *ContivClient) ServiceLBDelete(serviceName string, tenantName string) error {
1065+
// build key and URL
1066+
keyStr := serviceName + ":" + tenantName
1067+
url := c.baseURL + "/api/serviceLBs/" + keyStr + "/"
1068+
1069+
// http get the object
1070+
err := httpDelete(url)
1071+
if err != nil {
1072+
log.Debugf("Error deleting serviceLB %s. Err: %v", keyStr, err)
1073+
return err
1074+
}
1075+
1076+
return nil
1077+
}
1078+
10051079
// TenantPost posts the tenant object
10061080
func (c *ContivClient) TenantPost(obj *Tenant) error {
10071081
// build key and URL

0 commit comments

Comments
 (0)