added random values

.gitlab-ci.yml

@@ -6,6 +6,7 @@ stages:
   - test
   - build
   - deploy
+  - apply
   - integration-test
   - .post
 

build/ci/.terraform-ci.yml

@@ -60,7 +60,7 @@ plan:
   <<: *tf
 
 apply:
-  stage: integration-test
+  stage: apply
   script:
     - gitlab-terraform apply
   dependencies:

test/terraform/containers.tf

 resource "docker_container" "gosdn" {
   depends_on = [
     docker_container.ceos]
-  name = "contoller"
+  name = "contoller-${random_id.server.hex}"
   image = docker_image.gosdn.name
   restart = "always"
 
@@ -10,6 +10,16 @@ resource "docker_container" "gosdn" {
     external = 5555
   }
 
+  networks_advanced {
+    name =  docker_network.danet.name
+    ipv4_address = "fd::605d"
+  }
+
+  networks_advanced {
+    name =  docker_network.danet_legacy.name
+    ipv4_address = "172.100.100.10"
+  }
+
   env = [
     "GOSDN_DEBUG=",
     ]
@@ -18,7 +28,7 @@ resource "docker_container" "gosdn" {
 # create arista container
 # namespace is french cheeses
 resource "docker_container" "ceos" {
-  name  = "abondance"
+  name  = "ceos-${random_id.server.hex}"
   image = docker_image.ceos.name
   restart = "always"
 
@@ -31,6 +41,16 @@ resource "docker_container" "ceos" {
     name = "bridge"
   }
 
+  networks_advanced {
+    name =  docker_network.danet.name
+    ipv4_address = "fd::ce05"
+  }
+
+  networks_advanced {
+    name =  docker_network.danet_legacy.name
+    ipv4_address = "172.100.100.20"
+  }
+
   command = ["/sbin/init",
     "systemd.setenv=INTFTYPE=eth",
     "systemd.setenv=ETBA=4",

test/terraform/networks.tf

+resource "docker_network" "danet_legacy" {
+  name = "legacy-${random_id.server.hex}"
+
+  ipam_config {
+    subnet = "172.100.100.0/24"
+  }
+}
+
+resource "docker_network" "danet" {
+  name = "danet-${random_id.server.hex}"
+  ipv6 = true
+  ipam_config {
+    subnet = "fd::/64"
+  }
+}
\ No newline at end of file

test/terraform/resources.tf

+resource "random_id" "server" {
+  byte_length = 8
+}

test/terraform/variables.tf

@@ -24,4 +24,9 @@ variable "tls_ca_cert" {
 variable "container_tag" {
   type = string
   default = "registry.code.fbi.h-da.de/cocsn/gosdn:latest"
+}
+
+variable "network_name" {
+  type = string
+  default = ""
 }
\ No newline at end of file