Changes to automatically provision,build and run Radius containers for Auth tests.
Changes to cord test server to handle radius server restart requests.
diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 0628f9f..1b44abf 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -222,16 +222,21 @@
env = {'TIMEZONE':'America/Los_Angeles',
'DEBUG': 'true', 'cert_password':'whatever', 'primary_shared_secret':'radius_password'
}
- host_db_dir = os.path.join(os.getenv('HOME'), 'services', 'radius', 'data', 'db')
+ host_db_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'setup/radius-config/db')
guest_db_dir = os.path.join(os.path.sep, 'opt', 'db')
- host_config_dir = os.path.join(os.getenv('HOME'), 'services', 'radius', 'freeradius')
+ host_config_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'setup/radius-config/freeradius')
guest_config_dir = os.path.join(os.path.sep, 'etc', 'freeradius')
- start_command = '/root/start-radius.py'
+ start_command = os.path.join(guest_config_dir, 'start-radius.py')
host_guest_map = ( (host_db_dir, guest_db_dir),
(host_config_dir, guest_config_dir)
)
- def __init__(self, name = 'cord-radius', image = 'freeradius', tag = 'podd'):
+ def __init__(self, name = 'cord-radius', image = 'cord-test/radius', tag = 'latest',
+ boot_delay = 10, restart = False):
super(Radius, self).__init__(name, image, tag = tag, command = self.start_command)
+ if not self.img_exists():
+ self.build_image(image)
+ if restart is True and self.exists():
+ self.kill()
if not self.exists():
self.remove_container(name, force=True)
host_config = self.create_host_config(port_list = self.ports,
@@ -242,6 +247,23 @@
self.start(ports = self.ports, environment = self.env,
volumes = volumes,
host_config = host_config, tty = True)
+ time.sleep(boot_delay)
+
+ @classmethod
+ def build_image(cls, image):
+ print('Building Radius image %s' %image)
+ dockerfile = '''
+FROM hbouvier/docker-radius
+MAINTAINER chetan@ciena.com
+LABEL RUN docker pull hbouvier/docker-radius
+LABEL RUN docker run -it --name cord-radius hbouvier/docker-radius
+RUN apt-get update
+RUN apt-get -y install python python-pexpect strace
+WORKDIR /root
+CMD ["/etc/freeradius/start-radius.py"]
+'''
+ super(Radius, cls).build_image(dockerfile, image)
+ print('Done building image %s' %image)
class Quagga(Container):
quagga_config = ( { 'bridge' : 'quagga-br', 'ip': '10.10.0.3', 'mask' : 16 },
diff --git a/src/test/utils/CordTestServer.py b/src/test/utils/CordTestServer.py
index ca19950..06ddfba 100644
--- a/src/test/utils/CordTestServer.py
+++ b/src/test/utils/CordTestServer.py
@@ -28,8 +28,14 @@
quagga = Quagga(restart = True, config_file = config_file, boot_delay = boot_delay)
self.request.sendall('DONE')
+ def restart_radius(self, *args):
+ print('Restarting RADIUS Server')
+ radius = Radius(restart = True)
+ self.request.sendall('DONE')
+
callback_table = { 'RESTART_ONOS' : restart_onos,
'RESTART_QUAGGA' : restart_quagga,
+ 'RESTART_RADIUS' : restart_radius,
}
def handle(self):
@@ -86,3 +92,15 @@
if data == 'DONE':
return True
return False
+
+@nottest
+def cord_test_radius_restart():
+ '''Send Radius server restart to server'''
+ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ s.connect( (CORD_TEST_HOST, CORD_TEST_PORT) )
+ s.sendall('RESTART_RADIUS\n')
+ data = s.recv(1024).strip()
+ s.close()
+ if data == 'DONE':
+ return True
+ return False