Skip to content

Commit 4ec7ee2

Browse files
tieweikahou82
tiewei
authored and
kahou82
committed
Ensure global config is valid before creating network (#1070)
When global config (espeically fwd mode) is not set, we shouldn't allow creating network. The network created at that moment is may not having enough data to proceed. Also ensure global settings are set before any network creating in objapi_test Signed-off-by: Wei Tie <[email protected]>
1 parent 1af7a2a commit 4ec7ee2

File tree

2 files changed

+71
-3
lines changed

2 files changed

+71
-3
lines changed

‎netmaster/objApi/apiController.go

+22
Original file line numberDiff line numberDiff line change
@@ -1023,6 +1023,11 @@ func (ac *APIController) EndpointGroupDelete(endpointGroup *contivModel.Endpoint
10231023
func (ac *APIController) NetworkCreate(network *contivModel.Network) error {
10241024
log.Infof("Received NetworkCreate: %+v", network)
10251025

1026+
// Make sure global settings is valid
1027+
if err := validateGlobalConfig(network.Encap); err != nil {
1028+
return fmt.Errorf("Global configuration is not ready: %v", err.Error())
1029+
}
1030+
10261031
// Make sure tenant exists
10271032
if network.TenantName == "" {
10281033
return core.Errorf("Invalid tenant name")
@@ -2325,3 +2330,20 @@ func validatePorts(ports []string) bool {
23252330
}
23262331
return true
23272332
}
2333+
2334+
func validateGlobalConfig(netmode string) error {
2335+
globalConfig := contivModel.FindGlobal("global")
2336+
if globalConfig == nil {
2337+
return errors.New("global configuration is not ready")
2338+
}
2339+
if globalConfig.FwdMode == "" {
2340+
return errors.New("global forwarding mode is not set")
2341+
}
2342+
if strings.ToLower(netmode) == "vlan" && globalConfig.Vlans == "" {
2343+
return errors.New("global vlan range is not set")
2344+
}
2345+
if strings.ToLower(netmode) == "vxlan" && globalConfig.Vxlans == "" {
2346+
return errors.New("global vxlan range is not set")
2347+
}
2348+
return nil
2349+
}

‎netmaster/objApi/objapi_test.go

+49-3
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,8 @@ func checkDeleteTenant(t *testing.T, expError bool, tenant string) {
869869

870870
// TestTenantDelete tests deletion of tenant
871871
func TestTenantDelete(t *testing.T) {
872+
// ensure global configs set
873+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
872874
// Create one tenant, two networks and 3 epgs
873875
checkCreateTenant(t, false, "tenant1")
874876
checkCreateNetwork(t, false, "tenant1", "net1", "data", "vlan", "10.1.1.1/16", "10.1.1.254", 1, "", "", "")
@@ -971,7 +973,8 @@ func TestTenantAddDelete(t *testing.T) {
971973

972974
// TestOverlappingSubnets tests overlapping network create/delete REST api
973975
func TestOverlappingSubnets(t *testing.T) {
974-
976+
// ensure global configs set
977+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
975978
// Non-overlapping subnet for same tenant - vlan & gateway
976979
checkCreateNetwork(t, false, "default", "contiv1", "", "vlan", "10.1.1.0/24", "10.1.1.220", 1, "", "", "")
977980
checkCreateNetwork(t, false, "default", "contiv2", "", "vlan", "10.1.2.0/24", "10.1.2.254", 2, "", "", "")
@@ -1094,6 +1097,9 @@ func TestNetworkAddDeleteACIMode(t *testing.T) {
10941097

10951098
// TestNetworkAddDelete tests network create/delete REST api
10961099
func TestNetworkAddDelete(t *testing.T) {
1100+
// ensure global configs set
1101+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
1102+
10971103
// Basic vlan network
10981104
checkCreateNetwork(t, false, "default", "contiv", "", "vlan", "10.1.1.1/24", "10.1.1.254", 1, "", "", "")
10991105
checkInspectNetwork(t, false, "default", "contiv", "10.1.1.254", 1, 0)
@@ -1201,9 +1207,10 @@ func TestNetworkAddDelete(t *testing.T) {
12011207
}
12021208

12031209
func TestDynamicGlobalVlanRange(t *testing.T) {
1210+
// ensure global configs set
1211+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
12041212

12051213
// Basic vlan network creation
1206-
12071214
checkCreateNetwork(t, false, "default", "contiv1", "", "vlan", "10.1.1.1/24", "10.1.1.254", 10, "", "", "")
12081215
checkInspectNetwork(t, false, "default", "contiv1", "10.1.1.254", 10, 0)
12091216
//checkInspectGlobal(t, false, "1", "")
@@ -1265,7 +1272,8 @@ func TestDynamicGlobalVlanRange(t *testing.T) {
12651272
}
12661273

12671274
func TestDynamicGlobalVxlanRange(t *testing.T) {
1268-
1275+
// ensure global configs set
1276+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
12691277
insp, _ := contivClient.GlobalInspect("global") // Basic vxlan network creation
12701278

12711279
log.Printf("THE GLOBAL DUMP: %#v \n", insp)
@@ -1380,6 +1388,9 @@ func TestAciGwSetting(t *testing.T) {
13801388

13811389
// TestNetworkPktRanges tests pkt-tag ranges in network REST api
13821390
func TestNetworkPktRanges(t *testing.T) {
1391+
// ensure global configs set
1392+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
1393+
13831394
// verify auto allocation of vlans
13841395
checkCreateNetwork(t, false, "default", "contiv", "data", "vlan", "10.1.1.1/24", "10.1.1.254", 0, "", "", "")
13851396
verifyNetworkState(t, "default", "contiv", "data", "vlan", "10.1.1.1", "10.1.1.254", 24, 1, 0, "", "", 0)
@@ -1418,6 +1429,9 @@ func TestNetworkPktRanges(t *testing.T) {
14181429

14191430
// TestPolicyRules tests policy and rule REST objects
14201431
func TestPolicyRules(t *testing.T) {
1432+
// ensure global configs set
1433+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
1434+
14211435
containerID1 := "723e55bf5b244f47c1b184cb786a1c2ad8870cc3a3db723c49ac09f68a9d1e69"
14221436
ep1 := "657355bf5b244f47c1b184cb786a14535d8870cc3a3db723c49ac09f68a9d6a5"
14231437
checkCreateNetwork(t, false, "default", "contiv", "data", "vxlan", "10.1.1.1/16", "10.1.1.254", 1, "", "", "")
@@ -1516,6 +1530,9 @@ func TestPolicyRules(t *testing.T) {
15161530

15171531
// TestEpgPolicies tests attaching policy to EPG
15181532
func TestEpgPolicies(t *testing.T) {
1533+
// ensure global configs set
1534+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
1535+
15191536
// create network
15201537
checkCreateNetwork(t, false, "default", "contiv", "data", "vxlan", "10.1.1.1/16", "10.1.1.254", 1, "", "", "")
15211538

@@ -1582,6 +1599,8 @@ func TestEpgPolicies(t *testing.T) {
15821599

15831600
// TestExtContractsGroups tests management of external contracts groups
15841601
func TestExtContractsGroups(t *testing.T) {
1602+
// ensure global configs set
1603+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
15851604
// create network for the test
15861605
checkCreateNetwork(t, false, "default", "test-net", "data", "vlan", "23.1.1.1/16", "23.1.1.254", 1, "", "", "")
15871606
// create contract groups used for the test
@@ -1620,6 +1639,8 @@ func TestExtContractsGroups(t *testing.T) {
16201639

16211640
// TestAppProfile tests app-profile REST objects
16221641
func TestAppProfile(t *testing.T) {
1642+
// ensure global configs set
1643+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
16231644
// Create two networks and 3 epgs
16241645
checkCreateNetwork(t, false, "default", "net1", "data", "vlan", "10.1.1.1/16", "10.1.1.254", 1, "", "", "")
16251646
checkCreateNetwork(t, false, "default", "net2", "data", "vlan", "20.1.1.1/16", "20.1.1.254", 2, "", "", "")
@@ -1650,6 +1671,8 @@ func TestAppProfile(t *testing.T) {
16501671

16511672
//TestEpgNetprofile tests the netprofile netprofile REST objects.
16521673
func TestEpgnpTenant(t *testing.T) {
1674+
// ensure global configs set
1675+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
16531676

16541677
//create a network,
16551678
checkCreateNetwork(t, false, "default", "np-net", "data", "vxlan", "10.1.1.1/24", "10.1.1.254", 1, "", "", "")
@@ -1708,6 +1731,9 @@ func TestEpgnpTenant(t *testing.T) {
17081731
}
17091732

17101733
func TestEpgnp(t *testing.T) {
1734+
// ensure global configs set
1735+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
1736+
17111737
//create a network and netprofile
17121738
checkCreateNetwork(t, false, "default", "np-net", "data", "vxlan", "10.1.1.1/24", "10.1.1.254", 1, "", "", "")
17131739
checkCreateNetProfile(t, false, 5, 1500, "2gbps", "netprofile", "default")
@@ -1723,6 +1749,9 @@ func TestEpgnp(t *testing.T) {
17231749
}
17241750

17251751
func TestEpgUpdate(t *testing.T) {
1752+
// ensure global configs set
1753+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
1754+
17261755
//create a network, netprofile and group.
17271756
checkCreateNetwork(t, false, "default", "np-net", "data", "vxlan", "10.1.1.1/24", "10.1.1.254", 1, "", "", "")
17281757
checkCreateNetProfile(t, false, 5, 1500, "2gbps", "netprofile", "default")
@@ -1774,6 +1803,9 @@ func TestEpgUpdate(t *testing.T) {
17741803
}
17751804

17761805
func TestDeleteEpgNp(t *testing.T) {
1806+
// ensure global configs set
1807+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
1808+
17771809
//create a network, netprofile and group.
17781810
checkCreateNetwork(t, false, "default", "np-net", "data", "vxlan", "10.1.1.1/24", "10.1.1.254", 1, "", "", "")
17791811
checkCreateNetProfile(t, false, 5, 1500, "2gbps", "netprofile", "default")
@@ -1794,6 +1826,8 @@ func TestDeleteEpgNp(t *testing.T) {
17941826
}
17951827

17961828
func TestNetProfileupdate(t *testing.T) {
1829+
// ensure global configs set
1830+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
17971831

17981832
//create a network, netprofile.
17991833
checkCreateNetwork(t, false, "default", "np-net", "data", "vxlan", "10.1.1.1/24", "10.1.1.254", 1, "", "", "")
@@ -1830,6 +1864,9 @@ func TestNetProfileupdate(t *testing.T) {
18301864
}
18311865

18321866
func TestNetprofile(t *testing.T) {
1867+
// ensure global configs set
1868+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
1869+
18331870
//create a network & netprofile
18341871
checkCreateNetwork(t, false, "default", "net", "data", "vxlan", "10.1.1.1/24", "10.1.1.254", 1, "", "", "")
18351872
checkCreateNetProfile(t, false, 5, 1500, "2gbps", "profile1", "default")
@@ -1889,6 +1926,8 @@ func TestNetprofile(t *testing.T) {
18891926
}
18901927

18911928
func TestServiceProviderUpdate(t *testing.T) {
1929+
// ensure global configs set
1930+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
18921931

18931932
labels := []string{"key1=value1", "key2=value2"}
18941933
port := []string{"80:8080:TCP"}
@@ -1954,6 +1993,8 @@ func TestServiceProviderUpdate(t *testing.T) {
19541993
}
19551994

19561995
func TestServiceProviderUpdateServiceAdd(t *testing.T) {
1996+
// ensure global configs set
1997+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
19571998

19581999
labels := []string{"key1=value1", "key2=value2"}
19592000
port := []string{"80:8080:TCP"}
@@ -2018,6 +2059,8 @@ func TestServiceProviderUpdateServiceAdd(t *testing.T) {
20182059
}
20192060

20202061
func TestServicePreferredIP(t *testing.T) {
2062+
// ensure global configs set
2063+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
20212064

20222065
labels := []string{"key1=value1", "key2=value2"}
20232066
port := []string{"80:8080:TCP"}
@@ -2334,6 +2377,9 @@ func AddEP(tenant, nw, epg, id string) error {
23342377
}
23352378

23362379
func TestEPCreate(t *testing.T) {
2380+
// ensure global configs set
2381+
checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge", "proxy", "172.19.0.0/16")
2382+
23372383
checkCreateTenant(t, false, "teatwo")
23382384
checkCreateNetwork(t, false, "teatwo", "t2-net", "data", "vlan",
23392385
"60.1.1.1/24", "60.1.1.254", 1, "", "", "")

0 commit comments

Comments
 (0)