Skip to content

Commit 8cb0624

Browse files
JacobTanenbaumJacobTanenbaum
committed
fixed the validation tests to accomidate for HostSubnetLength per CIDR
1 parent f67dfb7 commit 8cb0624

File tree

1 file changed

+16
-32
lines changed

1 file changed

+16
-32
lines changed

‎pkg/sdn/apis/network/validation/validation_test.go

+16-32
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ func TestValidateClusterNetwork(t *testing.T) {
2626
name: "Good one",
2727
cn: &sdnapi.ClusterNetwork{
2828
ObjectMeta: metav1.ObjectMeta{Name: "any"},
29-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}},
30-
HostSubnetLength: 8,
29+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 8}},
3130
ServiceNetwork: "172.30.0.0/16",
3231
},
3332
expectedErrors: 0,
@@ -36,8 +35,7 @@ func TestValidateClusterNetwork(t *testing.T) {
3635
name: "Good one multiple addresses",
3736
cn: &sdnapi.ClusterNetwork{
3837
ObjectMeta: metav1.ObjectMeta{Name: "any"},
39-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}, {CIDR: "10.128.0.0/16"}},
40-
HostSubnetLength: 8,
38+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 8}, {CIDR: "10.128.0.0/16", HostSubnetLength: 8}},
4139
ServiceNetwork: "172.30.0.0/16",
4240
},
4341
expectedErrors: 0,
@@ -46,8 +44,7 @@ func TestValidateClusterNetwork(t *testing.T) {
4644
name: "Bad network",
4745
cn: &sdnapi.ClusterNetwork{
4846
ObjectMeta: metav1.ObjectMeta{Name: "any"},
49-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0.0/16"}},
50-
HostSubnetLength: 8,
47+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0.0/16", HostSubnetLength: 8}},
5148
ServiceNetwork: "172.30.0.0/16",
5249
},
5350
expectedErrors: 1,
@@ -56,8 +53,7 @@ func TestValidateClusterNetwork(t *testing.T) {
5653
name: "Bad network CIDR",
5754
cn: &sdnapi.ClusterNetwork{
5855
ObjectMeta: metav1.ObjectMeta{Name: "any"},
59-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.1/16"}},
60-
HostSubnetLength: 8,
56+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.1/16", HostSubnetLength: 8}},
6157
ServiceNetwork: "172.30.0.0/16",
6258
},
6359
expectedErrors: 1,
@@ -66,8 +62,7 @@ func TestValidateClusterNetwork(t *testing.T) {
6662
name: "Subnet length too large for network",
6763
cn: &sdnapi.ClusterNetwork{
6864
ObjectMeta: metav1.ObjectMeta{Name: "any"},
69-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.30.0/24"}},
70-
HostSubnetLength: 16,
65+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.30.0/24", HostSubnetLength: 16}},
7166
ServiceNetwork: "172.30.0.0/16",
7267
},
7368
expectedErrors: 1,
@@ -76,8 +71,7 @@ func TestValidateClusterNetwork(t *testing.T) {
7671
name: "Subnet length too small",
7772
cn: &sdnapi.ClusterNetwork{
7873
ObjectMeta: metav1.ObjectMeta{Name: "any"},
79-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}},
80-
HostSubnetLength: 1,
74+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 1}},
8175
ServiceNetwork: "172.30.0.0/16",
8276
},
8377
expectedErrors: 1,
@@ -86,8 +80,7 @@ func TestValidateClusterNetwork(t *testing.T) {
8680
name: "Bad service network",
8781
cn: &sdnapi.ClusterNetwork{
8882
ObjectMeta: metav1.ObjectMeta{Name: "any"},
89-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}},
90-
HostSubnetLength: 8,
83+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 8}},
9184
ServiceNetwork: "1172.30.0.0/16",
9285
},
9386
expectedErrors: 1,
@@ -96,8 +89,7 @@ func TestValidateClusterNetwork(t *testing.T) {
9689
name: "Bad service network CIDR",
9790
cn: &sdnapi.ClusterNetwork{
9891
ObjectMeta: metav1.ObjectMeta{Name: "any"},
99-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}},
100-
HostSubnetLength: 8,
92+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 8}},
10193
ServiceNetwork: "172.30.1.0/16",
10294
},
10395
expectedErrors: 1,
@@ -106,8 +98,7 @@ func TestValidateClusterNetwork(t *testing.T) {
10698
name: "Service network overlaps with cluster network",
10799
cn: &sdnapi.ClusterNetwork{
108100
ObjectMeta: metav1.ObjectMeta{Name: "any"},
109-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}},
110-
HostSubnetLength: 8,
101+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 8}},
111102
ServiceNetwork: "10.20.1.0/24",
112103
},
113104
expectedErrors: 1,
@@ -116,8 +107,7 @@ func TestValidateClusterNetwork(t *testing.T) {
116107
name: "Cluster network overlaps with service network",
117108
cn: &sdnapi.ClusterNetwork{
118109
ObjectMeta: metav1.ObjectMeta{Name: "any"},
119-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}},
120-
HostSubnetLength: 8,
110+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 8}},
121111
ServiceNetwork: "10.0.0.0/8",
122112
},
123113
expectedErrors: 1,
@@ -136,8 +126,7 @@ func TestValidateClusterNetwork(t *testing.T) {
136126
func TestSetDefaultClusterNetwork(t *testing.T) {
137127
defaultClusterNetwork := sdnapi.ClusterNetwork{
138128
ObjectMeta: metav1.ObjectMeta{Name: sdnapi.ClusterNetworkDefault},
139-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}},
140-
HostSubnetLength: 8,
129+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 8}},
141130
ServiceNetwork: "172.30.0.0/16",
142131
PluginName: "redhat/openshift-ovs-multitenant",
143132
}
@@ -157,8 +146,7 @@ func TestSetDefaultClusterNetwork(t *testing.T) {
157146
name: "Wrong Network",
158147
cn: &sdnapi.ClusterNetwork{
159148
ObjectMeta: metav1.ObjectMeta{Name: sdnapi.ClusterNetworkDefault},
160-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.30.0.0/16"}},
161-
HostSubnetLength: 8,
149+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.30.0.0/16", HostSubnetLength: 8}},
162150
ServiceNetwork: "172.30.0.0/16",
163151
PluginName: "redhat/openshift-ovs-multitenant",
164152
},
@@ -168,8 +156,7 @@ func TestSetDefaultClusterNetwork(t *testing.T) {
168156
name: "Additional Network",
169157
cn: &sdnapi.ClusterNetwork{
170158
ObjectMeta: metav1.ObjectMeta{Name: sdnapi.ClusterNetworkDefault},
171-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}, {CIDR: "10.30.0.0/16"}},
172-
HostSubnetLength: 8,
159+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 8}, {CIDR: "10.30.0.0/16", HostSubnetLength: 8}},
173160
ServiceNetwork: "172.30.0.0/16",
174161
PluginName: "redhat/openshift-ovs-multitenant",
175162
},
@@ -179,8 +166,7 @@ func TestSetDefaultClusterNetwork(t *testing.T) {
179166
name: "Wrong HostSubnetLength",
180167
cn: &sdnapi.ClusterNetwork{
181168
ObjectMeta: metav1.ObjectMeta{Name: sdnapi.ClusterNetworkDefault},
182-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}},
183-
HostSubnetLength: 9,
169+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength:9}},
184170
ServiceNetwork: "172.30.0.0/16",
185171
PluginName: "redhat/openshift-ovs-multitenant",
186172
},
@@ -190,8 +176,7 @@ func TestSetDefaultClusterNetwork(t *testing.T) {
190176
name: "Wrong ServiceNetwork",
191177
cn: &sdnapi.ClusterNetwork{
192178
ObjectMeta: metav1.ObjectMeta{Name: sdnapi.ClusterNetworkDefault},
193-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}},
194-
HostSubnetLength: 8,
179+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 8}},
195180
ServiceNetwork: "172.20.0.0/16",
196181
PluginName: "redhat/openshift-ovs-multitenant",
197182
},
@@ -201,8 +186,7 @@ func TestSetDefaultClusterNetwork(t *testing.T) {
201186
name: "Wrong PluginName",
202187
cn: &sdnapi.ClusterNetwork{
203188
ObjectMeta: metav1.ObjectMeta{Name: sdnapi.ClusterNetworkDefault},
204-
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16"}},
205-
HostSubnetLength: 8,
189+
ClusterNetworks: []sdnapi.ClusterNetworkEntry{{CIDR: "10.20.0.0/16", HostSubnetLength: 8}},
206190
ServiceNetwork: "172.30.0.0/16",
207191
PluginName: "redhat/openshift-ovs-subnet",
208192
},

0 commit comments

Comments
 (0)