Nodeport service and modified ssh and socket ports

We support now the use of K8s Nodeport services and non standard ssh and
prox socket ports.
In order to use Nodeport service, you need to specify the name of the
service for each prox pod in the rapid.pods file.

Signed-off-by: Luc Provoost <luc.provoost@gmail.com>
Change-Id: I2873b7e22fee042a14b575e772267a9128b7c4f2

1 files changed, 4 insertions, 2 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py
index 47f858d0..b95f4ff8 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py
@@ -30,6 +30,8 @@ class RapidMachine(object):
             machine_params, configonly):
         self.name = machine_params['name']
         self.ip = machine_params['admin_ip']
+        self.admin_port = machine_params['admin_port']
+        self.socket_port = machine_params['socket_port']
         self.key = key
         self.user = user
         self.password = password
@@ -148,7 +150,7 @@ class RapidMachine(object):
                 RapidLog.debug('devbind.sh running for port {} on {} {}'.format(index, self.name, result))
 
     def generate_lua(self, appendix = ''):
-        self.LuaFileName = 'parameters-{}.lua'.format(self.ip)
+        self.LuaFileName = 'parameters-{}-{}.lua'.format(self.ip, self.admin_port)
         with open(self.LuaFileName, "w") as LuaFile:
             LuaFile.write('require "helper"\n')
             LuaFile.write('name="%s"\n'% self.name)
@@ -210,7 +212,7 @@ class RapidMachine(object):
     def start_prox(self, autostart=''):
         if self.machine_params['prox_socket']:
             self._client = prox_ctrl(self.ip, self.key, self.user,
-                    self.password)
+                    self.password, self.admin_port, self.socket_port)
             self._client.test_connection()
             if self.vim in ['OpenStack']:
                 self.devbind()