Merge pull request #16 from netgroup/add-dns-solution

Add a DNS solution to the Mininet emulation

Author: cscarpitta

nets/8r-1c-in-band-isis/etc-hosts

@@ -1,15 +1,9 @@
-127.0.0.1	localhost
-127.0.1.1	rose-srv6
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-
 # Mininet hosts
+
+# Controller
 fcff:2:c::2     controller
+
+# Routers
 fcff:1::1       r1
 fcff:2::1       r2
 fcff:3::1       r3
@@ -18,6 +12,8 @@ fcff:5::1       r5
 fcff:6::1       r6
 fcff:7::1       r7
 fcff:8::1       r8
+
+# Hosts
 fd00:0:11::2    h11
 fd00:0:12::2    h12
 fd00:0:13::2    h13
@@ -30,6 +26,8 @@ fd00:0:53::2    h53
 fd00:0:81::2    h81
 fd00:0:82::2    h82
 fd00:0:83::2    h83
+
+# Data-centers
 fcff:2:1::2     hdc1
 fcff:8:1::2     hdc2
 fcff:5:1::2     hdc3

nets/8r-1c-in-band-isis/isis8d.py

@@ -10,7 +10,8 @@
     if os.path.exists('.venv'):
         with open('.venv', 'r') as venv_file:
             # Get virtualenv path from .venv file
-            venv_path = venv_file.read()
+            # and remove trailing newline chars
+            venv_path = venv_file.read().rstrip()
         # Get path of the activation script
         venv_path = os.path.join(venv_path, 'bin/activate_this.py')
         if not os.path.exists(venv_path):
@@ -24,6 +25,7 @@
             exec(code, {'__file__': venv_path})
 
 from argparse import ArgumentParser
+import python_hosts
 import shutil
 from dotenv import load_dotenv
 from mininet.topo import Topo
@@ -40,6 +42,14 @@
 
 PRIVDIR = '/var/priv'
 
+# Path of the file containing the entries (ip-hostname)
+# to be added to /etc/hosts
+ETC_HOSTS_FILE = './etc-hosts'
+
+# Define whether to add Mininet nodes to /etc/hosts file or not
+ADD_ETC_HOSTS = True
+
+# Define whether to start the node managers on the routers or not
 START_NODE_MANAGERS = False
 
 # Load environment variables from .env file
@@ -225,6 +235,28 @@ def create_topo(my_net):
     add_link(my_net, controller,r2)
 
 
+def add_nodes_to_etc_hosts():
+    # Get /etc/hosts
+    etc_hosts = python_hosts.hosts.Hosts()
+    # Import host-ip mapping defined in etc-hosts file
+    count = etc_hosts.import_file(ETC_HOSTS_FILE)
+    # Print results
+    count = count['add_result']['ipv6_count'] + count['add_result']['ipv4_count']
+    print('*** Added %s entries to /etc/hosts\n' % count)
+
+
+def remove_nodes_from_etc_hosts(net):
+    print('*** Removing entries from /etc/hosts\n')
+    # Get /etc/hosts
+    etc_hosts = python_hosts.hosts.Hosts()
+    for host in net.hosts:
+        # Remove all the nodes from /etc/hosts
+        etc_hosts.remove_all_matching(name=str(host))
+    # Write changes to /etc/hosts
+    etc_hosts.write()
+
+
+
 def stopAll():
     # Clean Mininet emulation environment
     os.system('sudo mn -c')
@@ -258,7 +290,16 @@ def simpleTest():
         for host in net.hosts:
             file.write("%s %d\n" % (host, extractHostPid( repr(host) )) )
 
+    # Add Mininet nodes to /etc/hosts
+    if ADD_ETC_HOSTS:
+        add_nodes_to_etc_hosts()
+
     CLI( net ) 
+
+    # Remove Mininet nodes from /etc/hosts
+    if ADD_ETC_HOSTS:
+        remove_nodes_from_etc_hosts(net)
+
     net.stop() 
     stopAll()
 
@@ -274,6 +315,11 @@ def parse_arguments():
         action='store_true', default=False,
         help='Define whether to start node manager on routers or not'
     )
+    parser.add_argument(
+        '--no-etc-hosts', dest='add_etc_hosts',
+        action='store_false', default=True,
+        help='Define whether to add Mininet nodes to /etc/hosts file or not'
+    )
     # Parse input parameters
     args = parser.parse_args()
     # Return the arguments
@@ -302,6 +348,8 @@ def parse_arguments():
                   'NODE_MANAGER_GRPC_PORT variable')
             print('NODE_MANAGER_GRPC_PORT variable not set in .env file\n')
             exit(-2)
+    # Define whether to add Mininet nodes to /etc/hosts file or not
+    ADD_ETC_HOSTS = args.add_etc_hosts
     # Tell mininet to print useful information
     setLogLevel('info')
     simpleTest()

nets/8r-1c-out-band-isis/etc-hosts

@@ -1,14 +1,6 @@
-127.0.0.1	localhost
-127.0.1.1	rose-srv6
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-
 # Mininet hosts
+
+# Routers
 fcff:1::1       r1
 fcff:2::1       r2
 fcff:3::1       r3
@@ -17,6 +9,8 @@ fcff:5::1       r5
 fcff:6::1       r6
 fcff:7::1       r7
 fcff:8::1       r8
+
+# Hosts
 fd00:0:11::2    h11
 fd00:0:12::2    h12
 fd00:0:13::2    h13
@@ -29,10 +23,13 @@ fd00:0:53::2    h53
 fd00:0:81::2    h81
 fd00:0:82::2    h82
 fd00:0:83::2    h83
+
+# Data-centers
 fcff:2:1::2     hdc1
 fcff:8:1::2     hdc2
 fcff:5:1::2     hdc3
 
+# Management network
 fcfd:0:0:fd::1	controller.m
 fcfd:0:0:1::1	r1.m
 fcfd:0:0:2::1	r2.m

nets/8r-1c-out-band-isis/isis8d.py

@@ -25,6 +25,7 @@
             exec(code, {'__file__': venv_path})
 
 from argparse import ArgumentParser
+import python_hosts
 import shutil
 from dotenv import load_dotenv
 from mininet.topo import Topo
@@ -41,6 +42,14 @@
 
 PRIVDIR = '/var/priv'
 
+# Path of the file containing the entries (ip-hostname)
+# to be added to /etc/hosts
+ETC_HOSTS_FILE = './etc-hosts'
+
+# Define whether to add Mininet nodes to /etc/hosts file or not
+ADD_ETC_HOSTS = True
+
+# Define whether to start the node managers on the routers or not
 START_NODE_MANAGERS = False
 
 # Load environment variables from .env file
@@ -275,6 +284,32 @@ def create_topo(my_net):
     add_link(my_net, r8, sw)
 
 
+def add_nodes_to_etc_hosts():
+    # Get /etc/hosts
+    etc_hosts = python_hosts.hosts.Hosts()
+    # Import host-ip mapping defined in etc-hosts file
+    count = etc_hosts.import_file(ETC_HOSTS_FILE)
+    # Print results
+    count = count['add_result']['ipv6_count'] + count['add_result']['ipv4_count']
+    print('*** Added %s entries to /etc/hosts\n' % count)
+
+
+def remove_nodes_from_etc_hosts(net):
+    print('*** Removing entries from /etc/hosts\n')
+    # Get /etc/hosts
+    etc_hosts = python_hosts.hosts.Hosts()
+    for host in net.hosts:
+        # Remove all the nodes from /etc/hosts
+        etc_hosts.remove_all_matching(name=str(host))
+    # Remove entries related to the management network
+    # These entries are in the form *.m (e.g. r1.m, controller.m)
+    # therefore they are not removed during the previous loop
+    for host in net.hosts:
+        etc_hosts.remove_all_matching(name='%s.m' % host)
+    # Write changes to /etc/hosts
+    etc_hosts.write()
+
+
 def stopAll():
     # Clean Mininet emulation environment
     os.system('sudo mn -c')
@@ -308,7 +343,16 @@ def simpleTest():
         for host in net.hosts:
             file.write("%s %d\n" % (host, extractHostPid( repr(host) )) )
 
+    # Add Mininet nodes to /etc/hosts
+    if ADD_ETC_HOSTS:
+        add_nodes_to_etc_hosts()
+
     CLI( net ) 
+
+    # Remove Mininet nodes from /etc/hosts
+    if ADD_ETC_HOSTS:
+        remove_nodes_from_etc_hosts(net)
+
     net.stop() 
     stopAll()
 
@@ -324,6 +368,11 @@ def parse_arguments():
         action='store_true', default=False,
         help='Define whether to start node manager on routers or not'
     )
+    parser.add_argument(
+        '--no-etc-hosts', dest='add_etc_hosts',
+        action='store_false', default=True,
+        help='Define whether to add Mininet nodes to /etc/hosts file or not'
+    )
     # Parse input parameters
     args = parser.parse_args()
     # Return the arguments
@@ -352,6 +401,8 @@ def parse_arguments():
                   'NODE_MANAGER_GRPC_PORT variable')
             print('NODE_MANAGER_GRPC_PORT variable not set in .env file\n')
             exit(-2)
+    # Define whether to add Mininet nodes to /etc/hosts file or not
+    ADD_ETC_HOSTS = args.add_etc_hosts
     # Tell mininet to print useful information
     setLogLevel('info')
     simpleTest()

nets/8r-1c-srv6-pm/isis8d.py

@@ -25,6 +25,7 @@
             exec(code, {'__file__': venv_path})
 
 from argparse import ArgumentParser
+import python_hosts
 import shutil
 from dotenv import load_dotenv
 from mininet.topo import Topo
@@ -41,6 +42,14 @@
 
 PRIVDIR = '/var/priv'
 
+# Path of the file containing the entries (ip-hostname)
+# to be added to /etc/hosts
+ETC_HOSTS_FILE = './etc-hosts'
+
+# Define whether to add Mininet nodes to /etc/hosts file or not
+ADD_ETC_HOSTS = True
+
+# Define whether to start the node managers on the routers or not
 START_NODE_MANAGERS = False
 
 # Load environment variables from .env file
@@ -275,6 +284,32 @@ def create_topo(my_net):
     add_link(my_net, r8, sw)
 
 
+def add_nodes_to_etc_hosts():
+    # Get /etc/hosts
+    etc_hosts = python_hosts.hosts.Hosts()
+    # Import host-ip mapping defined in etc-hosts file
+    count = etc_hosts.import_file(ETC_HOSTS_FILE)
+    # Print results
+    count = count['add_result']['ipv6_count'] + count['add_result']['ipv4_count']
+    print('*** Added %s entries to /etc/hosts\n' % count)
+
+
+def remove_nodes_from_etc_hosts(net):
+    print('*** Removing entries from /etc/hosts\n')
+    # Get /etc/hosts
+    etc_hosts = python_hosts.hosts.Hosts()
+    for host in net.hosts:
+        # Remove all the nodes from /etc/hosts
+        etc_hosts.remove_all_matching(name=str(host))
+    # Remove entries related to the management network
+    # These entries are in the form *.m (e.g. r1.m, controller.m)
+    # therefore they are not removed during the previous loop
+    for host in net.hosts:
+        etc_hosts.remove_all_matching(name='%s.m' % host)
+    # Write changes to /etc/hosts
+    etc_hosts.write()
+
+
 def stopAll():
     # Clean Mininet emulation environment
     os.system('sudo mn -c')
@@ -308,7 +343,16 @@ def simpleTest():
         for host in net.hosts:
             file.write("%s %d\n" % (host, extractHostPid( repr(host) )) )
 
+    # Add Mininet nodes to /etc/hosts
+    if ADD_ETC_HOSTS:
+        add_nodes_to_etc_hosts()
+
     CLI( net ) 
+
+    # Remove Mininet nodes from /etc/hosts
+    if ADD_ETC_HOSTS:
+        remove_nodes_from_etc_hosts(net)
+ 
     net.stop() 
     stopAll()
 
@@ -324,6 +368,11 @@ def parse_arguments():
         action='store_true', default=False,
         help='Define whether to start node manager on routers or not'
     )
+    parser.add_argument(
+        '--no-etc-hosts', dest='add_etc_hosts',
+        action='store_false', default=True,
+        help='Define whether to add Mininet nodes to /etc/hosts file or not'
+    )
     # Parse input parameters
     args = parser.parse_args()
     # Return the arguments
@@ -352,6 +401,8 @@ def parse_arguments():
                   'NODE_MANAGER_GRPC_PORT variable')
             print('NODE_MANAGER_GRPC_PORT variable not set in .env file\n')
             exit(-2)
+    # Define whether to add Mininet nodes to /etc/hosts file or not
+    ADD_ETC_HOSTS = args.add_etc_hosts
     # Tell mininet to print useful information
     setLogLevel('info')
     simpleTest()