Make portal_runid more unique and fix HOST

Author: rosswhitfield

ipsframework/configurationManager.py

@@ -382,6 +382,7 @@ def _initialize_fwk_components(self):
                 portal_conf['USER'] = self.sim_map[self.fwk_sim_name].sim_conf['USER']
             except KeyError:
                 portal_conf['USER'] = self.platform_conf['USER']
+            portal_conf['HOST'] = self.platform_conf['HOST']
             if self.fwk.log_level == logging.DEBUG:
                 portal_conf['LOG_LEVEL'] = 'DEBUG'
 

ipsframework/ips.py

@@ -611,7 +611,7 @@ def _send_monitor_event(self, sim_name='', eventType='', comment='', ok=True, ta
         get_config = self.config_manager.get_config_parameter
         if eventType == 'IPS_START':
             portal_data['state'] = 'Running'
-            portal_data['host'] = get_config(sim_name, 'HOST')
+            portal_data['host'] = self.config_manager.get_platform_parameter('HOST')
             try:
                 portal_data['outputprefix'] = get_config(sim_name, 'OUTPUT_PREFIX')
             except KeyError:

ipsframework/portalBridge.py

@@ -81,7 +81,6 @@ def __init__(self, services, config):
         :py:class:`component.Component` object.
         """
         super().__init__(services, config)
-        self.host = ''
         self.curTime = time.localtime()
         self.startTime = self.curTime
         self.sim_map = {}
@@ -109,7 +108,6 @@ def init(self, timestamp=0.0, **keywords):
             self.portal_url = self.PORTAL_URL
         except AttributeError:
             pass
-        self.host = self.services.get_config_param('HOST')
         self.services.subscribe('_IPS_MONITOR', "process_event")
         try:
             freq = int(self.services.get_config_param("HTML_DUMP_FREQ", silent=True))
@@ -427,7 +425,7 @@ def init_simulation(self, sim_name, sim_root):
 
         d = datetime.datetime.now()
         date_str = "%s.%03d" % (d.strftime("%Y-%m-%dT%H:%M:%S"), int(d.microsecond / 1000))
-        sim_data.portal_runid = "_".join([self.host, "USER", date_str])
+        sim_data.portal_runid = "_".join([sim_name, getattr(self, "HOST"), getattr(self, "USER"), date_str])
         try:
             self.services.set_config_param('PORTAL_RUNID', sim_data.portal_runid,
                                            target_sim_name=sim_name)
@@ -445,8 +443,7 @@ def init_simulation(self, sim_name, sim_root):
                                     (sim_log_dir, oserr.errno, oserr.strerror))
             raise
 
-        sim_data.monitor_file_name = os.path.join(sim_log_dir,
-                                                  sim_data.sim_name + '_' + sim_data.portal_runid + '.eventlog')
+        sim_data.monitor_file_name = os.path.join(sim_log_dir, sim_data.portal_runid + '.eventlog')
         try:
             sim_data.monitor_file = open(sim_data.monitor_file_name, 'wb', 0)
         except IOError as oserr: