test: update tests w/ connectivity field in spec

srl-labs · Jan 17, 2024 · 0ca126e · 0ca126e
1 parent 4a36054
commit 0ca126e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/clabverter/assets/topology.yaml.template b/clabverter/assets/topology.yaml.template
@@ -36,7 +36,7 @@ spec:
       {{- end }}
     {{- end }}
   {{- end }}
-
+  connectivity: vxlan
   definition:
     containerlab: |-
       {{- .ClabConfig }}
diff --git a/clabverter/test-fixtures/golden/srl02.yaml b/clabverter/test-fixtures/golden/srl02.yaml
@@ -5,6 +5,7 @@ metadata:
   name: srl02
   namespace: notclabernetes
 spec:
+  connectivity: vxlan
   definition:
     containerlab: |-
       name: srl02
@@ -57,7 +58,6 @@ spec:
     resources: null
     scheduling:
       tolerations: null
-  enableSlurpeeth: false
   expose:
     disableAutoExpose: false
     disableExpose: false

diff --git a/controllers/topology/deployment_test.go b/controllers/topology/deployment_test.go
@@ -144,6 +144,7 @@ func TestRenderDeployment(t *testing.T) {
 					Namespace: "clabernetes",
 				},
 				Spec: clabernetesapisv1alpha1.TopologySpec{
+					Connectivity: clabernetesconstants.ConnectivityVXLAN,
 					Definition: clabernetesapisv1alpha1.Definition{
 						Containerlab: `---
     name: test
@@ -201,6 +202,7 @@ func TestRenderDeployment(t *testing.T) {
 					Namespace: "clabernetes",
 				},
 				Spec: clabernetesapisv1alpha1.TopologySpec{
+					Connectivity: clabernetesconstants.ConnectivityVXLAN,
 					Deployment: clabernetesapisv1alpha1.Deployment{
 						PrivilegedLauncher: clabernetesutil.ToPointer(true),
 					},
@@ -261,6 +263,7 @@ func TestRenderDeployment(t *testing.T) {
 					Namespace: "clabernetes",
 				},
 				Spec: clabernetesapisv1alpha1.TopologySpec{
+					Connectivity: clabernetesconstants.ConnectivityVXLAN,
 					Deployment: clabernetesapisv1alpha1.Deployment{
 						ContainerlabDebug: clabernetesutil.ToPointer(true),
 					},
@@ -321,6 +324,7 @@ func TestRenderDeployment(t *testing.T) {
 					Namespace: "clabernetes",
 				},
 				Spec: clabernetesapisv1alpha1.TopologySpec{
+					Connectivity: clabernetesconstants.ConnectivityVXLAN,
 					Deployment: clabernetesapisv1alpha1.Deployment{
 						LauncherLogLevel: "debug",
 					},
@@ -381,6 +385,7 @@ func TestRenderDeployment(t *testing.T) {
 					Namespace: "clabernetes",
 				},
 				Spec: clabernetesapisv1alpha1.TopologySpec{
+					Connectivity: clabernetesconstants.ConnectivityVXLAN,
 					ImagePull: clabernetesapisv1alpha1.ImagePull{
 						InsecureRegistries: []string{"1.2.3.4", "potato.com"},
 					},
@@ -441,6 +446,7 @@ func TestRenderDeployment(t *testing.T) {
 					Namespace: "clabernetes",
 				},
 				Spec: clabernetesapisv1alpha1.TopologySpec{
+					Connectivity: clabernetesconstants.ConnectivityVXLAN,
 					ImagePull: clabernetesapisv1alpha1.ImagePull{
 						DockerDaemonConfig: "sneakydockerdaemonconfig",
 					},
@@ -501,6 +507,7 @@ func TestRenderDeployment(t *testing.T) {
 					Namespace: "clabernetes",
 				},
 				Spec: clabernetesapisv1alpha1.TopologySpec{
+					Connectivity: clabernetesconstants.ConnectivityVXLAN,
 					Deployment: clabernetesapisv1alpha1.Deployment{
 						Scheduling: clabernetesapisv1alpha1.Scheduling{
 							NodeSelector: map[string]string{

diff --git a/e2e/clabverter/test-fixtures/golden/10-topology.clabverter-basic.yaml b/e2e/clabverter/test-fixtures/golden/10-topology.clabverter-basic.yaml
@@ -5,6 +5,7 @@ metadata:
   name: clabverter-basic
   namespace: NAMESPACE
 spec:
+  connectivity: vxlan
   definition:
     containerlab: |-
       ---
@@ -25,7 +26,6 @@ spec:
     persistence:
       enabled: false
     scheduling: {}
-  enableSlurpeeth: false
   expose:
     disableAutoExpose: false
     disableExpose: false

diff --git a/e2e/topology/basic/test-fixtures/golden/10-topology.topology-basic.yaml b/e2e/topology/basic/test-fixtures/golden/10-topology.topology-basic.yaml
@@ -5,6 +5,7 @@ metadata:
   name: topology-basic
   namespace: NAMESPACE
 spec:
+  connectivity: vxlan
   definition:
     containerlab: |-
       name: topology-basic
@@ -18,7 +19,6 @@ spec:
     persistence:
       enabled: false
     scheduling: {}
-  enableSlurpeeth: false
   expose:
     disableAutoExpose: false
     disableExpose: false