vjunos: Add IPv6 management addresses, fix v4 address templating

michelredondo · Oct 29, 2024 · bf4460a · bf4460a
1 parent 6143dc5
commit bf4460a
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/vjunosevolved/docker/init.conf b/vjunosevolved/docker/init.conf
@@ -25,7 +25,10 @@ interfaces {
     re0:mgmt-0 {
         unit 0 {
             family inet {
-                address {MGMT_IP_V4};
+                address {MGMT_IP_IPV4};
+            }
+            family inet {
+                address {MGMT_IP_IPV6};
             }
         }
     }
@@ -34,7 +37,12 @@ routing-instances {
     mgmt_junos {
         routing-options {
             static {
-                route 0.0.0.0/0 next-hop {MGMT_GW_V4};
+                route 0.0.0.0/0 next-hop {MGMT_GW_IPV4};
+            }
+            rib mgmt_junos.inet6.0 {
+                static {
+                    route ::/0 next-hop {MGMT_GW_IPV6};
+                }
             }
         }
     }

diff --git a/vjunosevolved/docker/launch.py b/vjunosevolved/docker/launch.py
@@ -70,6 +70,8 @@ def __init__(self, hostname, username, password, conn_mode):
 
         cfg = cfg.replace("{MGMT_IP_IPV4}", self.mgmt_address_ipv4)
         cfg = cfg.replace("{MGMT_GW_IPV4}", self.mgmt_gw_ipv4)
+        cfg = cfg.replace("{MGMT_IP_IPV6}", self.mgmt_address_ipv6)
+        cfg = cfg.replace("{MGMT_GW_IPV6}", self.mgmt_gw_ipv6)
         cfg = cfg.replace("{HOSTNAME}", self.hostname)
         # replace CRYPT_PSWD file var with nodes given password
         # (Evo does not accept plaintext passwords in config)

diff --git a/vjunosrouter/docker/init.conf b/vjunosrouter/docker/init.conf
@@ -25,7 +25,10 @@ interfaces {
     fxp0 {
         unit 0 {
             family inet {
-                address {MGMT_IP_V4};
+                address {MGMT_IP_IPV4};
+            }
+            family inet6 {
+                address {MGMT_IP_IPV6};
             }
         }
     }
@@ -34,7 +37,12 @@ routing-instances {
     mgmt_junos {
         routing-options {
             static {
-                route 0.0.0.0/0 next-hop {MGMT_GW_V4};
+                route 0.0.0.0/0 next-hop {MGMT_GW_IPV4};
+            }
+            rib mgmt_junos.inet6.0 {
+                static {
+                    route ::/0 next-hop {MGMT_GW_IPV6};
+                }
             }
         }
     }

diff --git a/vjunosrouter/docker/launch.py b/vjunosrouter/docker/launch.py
@@ -64,6 +64,8 @@ def __init__(self, hostname, username, password, conn_mode):
 
         cfg = cfg.replace("{MGMT_IP_IPV4}", self.mgmt_address_ipv4)
         cfg = cfg.replace("{MGMT_GW_IPV4}", self.mgmt_gw_ipv4)
+        cfg = cfg.replace("{MGMT_IP_IPV6}", self.mgmt_address_ipv6)
+        cfg = cfg.replace("{MGMT_GW_IPV6}", self.mgmt_gw_ipv6)
         cfg = cfg.replace("{HOSTNAME}", self.hostname)
 
         # write changes to init.conf file

diff --git a/vjunosswitch/docker/init.conf b/vjunosswitch/docker/init.conf
@@ -25,7 +25,10 @@ interfaces {
     fxp0 {
         unit 0 {
             family inet {
-                address {MGMT_IP_V4};
+                address {MGMT_IP_IPV4};
+            }
+            family inet6 {
+                address {MGMT_IP_IPV6};
             }
         }
     }
@@ -34,7 +37,12 @@ routing-instances {
     mgmt_junos {
         routing-options {
             static {
-                route 0.0.0.0/0 next-hop {MGMT_GW_V4};
+                route 0.0.0.0/0 next-hop {MGMT_GW_IPV4};
+            }
+            rib mgmt_junos.inet6.0 {
+                static {
+                    route ::/0 next-hop {MGMT_GW_IPV6};
+                }
             }
         }
     }

diff --git a/vjunosswitch/docker/launch.py b/vjunosswitch/docker/launch.py
@@ -64,6 +64,8 @@ def __init__(self, hostname, username, password, conn_mode):
 
         cfg = cfg.replace("{MGMT_IP_IPV4}", self.mgmt_address_ipv4)
         cfg = cfg.replace("{MGMT_GW_IPV4}", self.mgmt_gw_ipv4)
+        cfg = cfg.replace("{MGMT_IP_IPV6}", self.mgmt_address_ipv6)
+        cfg = cfg.replace("{MGMT_GW_IPV6}", self.mgmt_gw_ipv6)
         cfg = cfg.replace("{HOSTNAME}", self.hostname)
 
         # write changes to init.conf file