Skip to content

Commit ac902c6

Browse files
g1ranag1rana
committed
moved netdXXX APIs into common utils package
1 parent 9740990 commit ac902c6

File tree

6 files changed

+55
-87
lines changed

6 files changed

+55
-87
lines changed

‎mgmtfn/dockplugin/ipamDriver.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
log "github.com/Sirupsen/logrus"
2626
"github.com/contiv/netplugin/netmaster/master"
2727
"github.com/contiv/netplugin/netplugin/cluster"
28+
"github.com/contiv/netplugin/utils"
2829
"github.com/docker/libnetwork/ipams/remote/api"
2930
"github.com/docker/libnetwork/netlabel"
3031
)
@@ -97,7 +98,7 @@ func requestPool(w http.ResponseWriter, r *http.Request) {
9798
Pool = epgCfg.IPPool
9899
} else {
99100
// Get the pool from the Network
100-
nwCfg, err := netdGetNetwork(epgCfg.NetworkName + "." + epgCfg.TenantName)
101+
nwCfg, err := utils.GetNetwork(epgCfg.NetworkName + "." + epgCfg.TenantName)
101102
if err != nil {
102103
httpError(w, "failed to lookup network. ", err)
103104
return

‎mgmtfn/dockplugin/netDriver.go

+5-41
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
log "github.com/Sirupsen/logrus"
2727
"github.com/contiv/contivmodel/client"
28-
"github.com/contiv/netplugin/drivers"
2928
"github.com/contiv/netplugin/netmaster/docknet"
3029
"github.com/contiv/netplugin/netmaster/intent"
3130
"github.com/contiv/netplugin/netmaster/master"
@@ -148,7 +147,7 @@ func deleteEndpoint(hostname string) func(http.ResponseWriter, *http.Request) {
148147
}
149148

150149
netID := netName + "." + tenantName
151-
_, err = netdGetEndpoint(netID + "-" + delreq.EndpointID)
150+
_, err = utils.GetEndpoint(netID + "-" + delreq.EndpointID)
152151
if err != nil {
153152
httpError(w, "Could not find endpoint", err)
154153
return
@@ -232,7 +231,7 @@ func createEndpoint(hostname string) func(http.ResponseWriter, *http.Request) {
232231
return
233232
}
234233

235-
ep, err := netdGetEndpoint(netID + "-" + cereq.EndpointID)
234+
ep, err := utils.GetEndpoint(netID + "-" + cereq.EndpointID)
236235
if err != nil {
237236
httpError(w, "Could not find created endpoint", err)
238237
return
@@ -310,13 +309,13 @@ func join(w http.ResponseWriter, r *http.Request) {
310309
}
311310

312311
netID := netName + "." + tenantName
313-
ep, err := netdGetEndpoint(netID + "-" + jr.EndpointID)
312+
ep, err := utils.GetEndpoint(netID + "-" + jr.EndpointID)
314313
if err != nil {
315314
httpError(w, "Could not find created endpoint", err)
316315
return
317316
}
318317

319-
nw, err := netdGetNetwork(netID)
318+
nw, err := utils.GetNetwork(netID)
320319
if err != nil {
321320
httpError(w, "Could not get network", err)
322321
return
@@ -530,41 +529,6 @@ func discoverDelete(w http.ResponseWriter, r *http.Request) {
530529
w.Write(content)
531530
}
532531

533-
func netdGetEndpoint(epID string) (*drivers.OperEndpointState, error) {
534-
// Get hold of the state driver
535-
stateDriver, err := utils.GetStateDriver()
536-
if err != nil {
537-
return nil, err
538-
}
539-
540-
operEp := &drivers.OperEndpointState{}
541-
operEp.StateDriver = stateDriver
542-
err = operEp.Read(epID)
543-
if err != nil {
544-
return nil, err
545-
}
546-
547-
return operEp, nil
548-
}
549-
550-
func netdGetNetwork(networkID string) (*mastercfg.CfgNetworkState, error) {
551-
// Get hold of the state driver
552-
stateDriver, err := utils.GetStateDriver()
553-
if err != nil {
554-
return nil, err
555-
}
556-
557-
// find the network from network id
558-
nwCfg := &mastercfg.CfgNetworkState{}
559-
nwCfg.StateDriver = stateDriver
560-
err = nwCfg.Read(networkID)
561-
if err != nil {
562-
return nil, err
563-
}
564-
565-
return nwCfg, nil
566-
}
567-
568532
// GetDockerNetworkName gets network name from network UUID
569533
func GetDockerNetworkName(nwID string) (string, string, string, error) {
570534
// first see if we can find the network in docknet oper state
@@ -781,7 +745,7 @@ func createNetworkHelper(networkID string, tag string, IPv4Data, IPv6Data []driv
781745
// deleteNetworkHelper removes the association between docker network and contiv network
782746
func deleteNetworkHelper(networkID string) error {
783747
netID := networkID + ".default"
784-
_, err := netdGetNetwork(netID)
748+
_, err := utils.GetNetwork(netID)
785749
if err == nil {
786750
// if we find a contiv network with the ID hash, then it must be
787751
// a docker created network (from the libnetwork create api).

‎mgmtfn/k8splugin/driver.go

+3-42
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ import (
2626
"time"
2727

2828
log "github.com/Sirupsen/logrus"
29-
"github.com/contiv/netplugin/drivers"
3029
"github.com/contiv/netplugin/mgmtfn/k8splugin/cniapi"
3130
"github.com/contiv/netplugin/netmaster/intent"
3231
"github.com/contiv/netplugin/netmaster/master"
33-
"github.com/contiv/netplugin/netmaster/mastercfg"
3432
"github.com/contiv/netplugin/netplugin/cluster"
3533
"github.com/contiv/netplugin/utils"
3634
"github.com/contiv/netplugin/utils/netutils"
@@ -55,43 +53,6 @@ type epAttr struct {
5553
IPv6Gateway string
5654
}
5755

58-
// netdGetEndpoint is a utility that reads the EP oper state
59-
func netdGetEndpoint(epID string) (*drivers.OperEndpointState, error) {
60-
// Get hold of the state driver
61-
stateDriver, err := utils.GetStateDriver()
62-
if err != nil {
63-
return nil, err
64-
}
65-
66-
operEp := &drivers.OperEndpointState{}
67-
operEp.StateDriver = stateDriver
68-
err = operEp.Read(epID)
69-
if err != nil {
70-
return nil, err
71-
}
72-
73-
return operEp, nil
74-
}
75-
76-
// netdGetNetwork is a utility that reads the n/w oper state
77-
func netdGetNetwork(networkID string) (*mastercfg.CfgNetworkState, error) {
78-
// Get hold of the state driver
79-
stateDriver, err := utils.GetStateDriver()
80-
if err != nil {
81-
return nil, err
82-
}
83-
84-
// find the network from network id
85-
nwCfg := &mastercfg.CfgNetworkState{}
86-
nwCfg.StateDriver = stateDriver
87-
err = nwCfg.Read(networkID)
88-
if err != nil {
89-
return nil, err
90-
}
91-
92-
return nwCfg, nil
93-
}
94-
9556
// epCleanUp deletes the ep from netplugin and netmaster
9657
func epCleanUp(req *epSpec) error {
9758
// first delete from netplugin
@@ -128,7 +89,7 @@ func createEP(req *epSpec) (*epAttr, error) {
12889

12990
// if the ep already exists, treat as error for now.
13091
netID := req.Network + "." + req.Tenant
131-
ep, err := netdGetEndpoint(netID + "-" + req.EndpointID)
92+
ep, err := utils.GetEndpoint(netID + "-" + req.EndpointID)
13293
if err == nil {
13394
return nil, fmt.Errorf("EP %s already exists", req.EndpointID)
13495
}
@@ -165,15 +126,15 @@ func createEP(req *epSpec) (*epAttr, error) {
165126
return nil, err
166127
}
167128

168-
ep, err = netdGetEndpoint(netID + "-" + req.EndpointID)
129+
ep, err = utils.GetEndpoint(netID + "-" + req.EndpointID)
169130
if err != nil {
170131
epCleanUp(req)
171132
return nil, err
172133
}
173134

174135
log.Debug(ep)
175136
// need to get the subnetlen from nw state.
176-
nw, err := netdGetNetwork(netID)
137+
nw, err := utils.GetNetwork(netID)
177138
if err != nil {
178139
epCleanUp(req)
179140
return nil, err

‎test/systemtests/cfg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"scheduler": "k8s", "install_mode": "kubeadm", "swarm_variable": "", "platform": "vagrant", "product": "netplugin", "aci_mode": "off", "short": false, "containers": 3, "iterations": 3, "enableDNS": false, "contiv_l3": "", "contiv_cluster_store": "etcd://netmaster:6666", "keyFile": "/home/admin/.ssh/id_rsa", "binpath": "contiv/bin", "hostips": "192.168.2.10,192.168.2.11,192.168.2.12", "hostusernames": "admin,admin,admin", "dataInterfaces": "eth2", "mgmtInterface": "eth1", "vlan": "1120-1150", "vxlan": "1-10000", "subnet": "10.1.1.0/24", "gateway": "10.1.1.254", "network": "TestNet", "tenant": "TestTenant", "encap": "vlan"}
1+
{"install_mode": "legacy", "binpath": "/opt/gopath/bin", "iterations": 3, "encap": "vlan", "keyFile": "/home/admin/.ssh/id_rsa", "gateway": "10.1.1.254", "subnet": "10.1.1.0/24", "network": "TestNet", "contiv_cluster_store": "etcd://localhost:2379", "platform": "vagrant", "mgmtInterface": "eth1", "dataInterfaces": "eth2,eth3", "vxlan": "1-10000", "product": "netplugin", "swarm_variable": "", "vlan": "1120-1150", "aci_mode": "off", "scheduler": "docker", "enableDNS": false, "tenant": "TestTenant", "short": false, "hostips": "192.168.2.10,192.168.2.11,192.168.2.12", "hostusernames": "admin,admin,admin", "containers": 3, "contiv_l3": ""}

‎utils/netutils/netutils.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ import (
3131
osexec "os/exec"
3232

3333
log "github.com/Sirupsen/logrus"
34+
"github.com/contiv/netplugin/core"
3435
"github.com/jainvipin/bitset"
3536
netlink "github.com/vishvananda/netlink"
36-
37-
"github.com/contiv/netplugin/core"
3837
)
3938

4039
var endianNess string

‎utils/stateutils.go

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package utils
2+
3+
import (
4+
"github.com/contiv/netplugin/drivers"
5+
"github.com/contiv/netplugin/netmaster/mastercfg"
6+
)
7+
8+
// GetEndpoint is a utility that reads the EP oper state
9+
func GetEndpoint(epID string) (*drivers.OperEndpointState, error) {
10+
// Get hold of the state driver
11+
stateDriver, err := GetStateDriver()
12+
if err != nil {
13+
return nil, err
14+
}
15+
16+
operEp := &drivers.OperEndpointState{}
17+
operEp.StateDriver = stateDriver
18+
err = operEp.Read(epID)
19+
if err != nil {
20+
return nil, err
21+
}
22+
23+
return operEp, nil
24+
}
25+
26+
// GetNetwork is a utility that reads the n/w oper state
27+
func GetNetwork(networkID string) (*mastercfg.CfgNetworkState, error) {
28+
// Get hold of the state driver
29+
stateDriver, err := GetStateDriver()
30+
if err != nil {
31+
return nil, err
32+
}
33+
34+
// find the network from network id
35+
nwCfg := &mastercfg.CfgNetworkState{}
36+
nwCfg.StateDriver = stateDriver
37+
err = nwCfg.Read(networkID)
38+
if err != nil {
39+
return nil, err
40+
}
41+
42+
return nwCfg, nil
43+
}

0 commit comments

Comments
 (0)