updating sfa test code to specify the hostname of services rahter than localhost

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 02b8079..c646ca0 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -957,11 +957,15 @@ class TestPlc:
         fileconf.write ('u\n')
         for var in [ 'SFA_REGISTRY_ROOT_AUTH',
                      'SFA_REGISTRY_LEVEL1_AUTH',
+                    'SFA_REGISTRY_HOST',
+                    'SFA_AGGREGATE_HOST',
+                     'SFA_SM_HOST',
                      'SFA_PLC_USER',
                      'SFA_PLC_PASSWORD',
                      'SFA_PLC_DB_HOST',
                      'SFA_PLC_DB_USER',
-                     'SFA_PLC_DB_PASSWORD']:
+                     'SFA_PLC_DB_PASSWORD',
+                    'SFA_PLC_URL']:
             fileconf.write ('%s\n'%(self.plc_spec['sfa'][var]))
         fileconf.write('w\n')
         fileconf.write('q\n')
@@ -1002,9 +1006,11 @@ class TestPlc:
        SFI_USER=SFI_AUTH+'.fake-pi1'
         fileconf.write ("SFI_USER='%s'"%SFI_USER)
        fileconf.write('\n')
-        fileconf.write ("SFI_REGISTRY='http://localhost:12345/'")
+       SFI_REGISTRY='http://' + self.plc_spec['sfa']['SFA_PLC_DB_HOST'] + ':12345/'
+        fileconf.write ("SFI_REGISTRY='%s'"%SFI_REGISTRY)
        fileconf.write('\n')
-        fileconf.write ("SFI_SM='http://localhost:12347/'")
+       SFI_SM='http://' + self.plc_spec['sfa']['SFA_PLC_DB_HOST'] + ':12347/'
+        fileconf.write ("SFI_SM='%s'"%SFI_SM)
        fileconf.write('\n')
         fileconf.close()
 
@@ -1075,7 +1081,7 @@ class TestPlc:
        self.run_in_guest("sfi.py -d /root/.sfi/ list %s.main"%auth)==0 and \
        self.run_in_guest("sfi.py -d /root/.sfi/ show %s.main"%auth)==0 and \
        self.run_in_guest("sfi.py -d /root/.sfi/ slices")==0 and \
-       self.run_in_guest("sfi.py -d /root/.sfi/ resources -o my_resources")==0
+       self.run_in_guest("sfi.py -d /root/.sfi/ resources")==0
 
     @slice_mapper_options_sfa
     def check_slice_sfa(self): 

diff --git a/system/TestResources.py b/system/TestResources.py
index 8e94dd9..8ae9abb 100644 (file)
--- a/system/TestResources.py
+++ b/system/TestResources.py
@@ -208,12 +208,17 @@ class TestResources:
         return True
 
     def localize_rspec (self,plcs,options):
-        
-        utils.header ("Localize SFA Slice RSpec")
+       
+       utils.header ("Localize SFA Slice RSpec")
 
        for plc in plcs:
            for site in plc['sites']:
                for node in site['nodes']:
                    plc['sfa']['sfa_slice_rspec']['part4'] = node['node_fields']['hostname']
+            plc['sfa']['SFA_REGISTRY_HOST'] = plc['PLC_DB_HOST']
+            plc['sfa']['SFA_AGGREGATE_HOST'] = plc['PLC_DB_HOST']
+            plc['sfa']['SFA_SM_HOST'] = plc['PLC_DB_HOST']
+            plc['sfa']['SFA_PLC_DB_HOST'] = plc['PLC_DB_HOST']
+           plc['sfa']['SFA_PLC_URL'] = 'https://' + plc['PLC_API_HOST'] + ':443/PLCAPI/' 
        
        return plcs