Skip to content

Commit 7a9a8f6

Browse files
committed
updating to latest contivmodel
godep update
1 parent aa17c85 commit 7a9a8f6

File tree

9 files changed

+29
-28
lines changed

9 files changed

+29
-28
lines changed

Godeps/Godeps.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/contiv/contivmodel/client/contivModel.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/contiv/contivmodel/client/contivModelClient.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/contiv/contivmodel/client/contivModelClient.py

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/contiv/contivmodel/contivModel.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/contiv/contivmodel/network.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/contiv/contivmodel/servicelb.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

netctl/netctl.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ func createServiceLB(ctx *cli.Context) {
750750
errCheck(ctx, getClient(ctx).ServiceLBPost(&contivClient.ServiceLB{
751751
ServiceName: serviceName,
752752
TenantName: tenantName,
753-
Network: serviceSubnet,
753+
NetworkName: serviceSubnet,
754754
Selectors: selectors,
755755
Ports: ports,
756756
IpAddress: ipAddress,
@@ -795,13 +795,14 @@ func listServiceLB(ctx *cli.Context) {
795795

796796
writer := tabwriter.NewWriter(os.Stdout, 0, 2, 2, ' ', 0)
797797
defer writer.Flush()
798-
writer.Write([]byte("ServiceName\tTenant\tselectors\n"))
799-
writer.Write([]byte("---------\t--------\t-------\n"))
798+
writer.Write([]byte("ServiceName\tTenant\tNetwork\tSelectors\n"))
799+
writer.Write([]byte("---------\t--------\t-------\t-------\n"))
800800
for _, group := range filtered {
801801
writer.Write(
802-
[]byte(fmt.Sprintf("%v\t%v\t%v\t\n",
802+
[]byte(fmt.Sprintf("%v\t%v\t%v\t%v\t\n",
803803
group.ServiceName,
804804
group.TenantName,
805+
group.NetworkName,
805806
group.Selectors,
806807
)))
807808
}

netmaster/objApi/apiController.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ func (ac *APIController) ServiceLBCreate(serviceCfg *contivModel.ServiceLB) erro
11171117
serviceIntentCfg := intent.ConfigServiceLB{
11181118
ServiceName: serviceCfg.ServiceName,
11191119
Tenant: serviceCfg.TenantName,
1120-
Network: serviceCfg.Network,
1120+
Network: serviceCfg.NetworkName,
11211121
IPAddress: serviceCfg.IpAddress,
11221122
}
11231123
serviceIntentCfg.Ports = append(serviceIntentCfg.Ports, serviceCfg.Ports...)

0 commit comments

Comments
 (0)