Preparing for 3.3.0 release

CHANGELOG.rst

@@ -24,6 +24,8 @@ Fixed
 ~~~~~
 
 - Loggers outputing to previous experiments files when repeating deploy experiments (#46)
+- Loggers not outputing to logfiles when running workflows incrementally (#44)
+- workflow_env syntax checking failing when `app_conf` names are digits (#39)
 
 `3.2.2`_
 -----------------------------------------------------------------------------

e2clab/providers/plugins/Iotlab.py

@@ -66,117 +66,6 @@ class Iotlab(Provider):
     def destroy(self):
         self.provider.destroy()
 
-    # def __provider_iotlab(self, infra_config, optimization_id):
-    #     # infra_config.refine_to_environment(IOT_LAB)
-
-    #     logger.info(f" layers_services [{IOT_LAB}] = {self.infra_config}")
-
-    #     # _job_name = infra_config[ENVIRONMENT][JOB_NAME]
-    #     #   if JOB_NAME in infra_config[ENVIRONMENT] else default.JOB_NAME
-    #     # _walltime = infra_config[ENVIRONMENT][WALLTIME]
-    #     #   if WALLTIME in infra_config[ENVIRONMENT] else default.WALLTIME
-    #     # _cluster = infra_config[ENVIRONMENT][CLUSTER]
-    #     #   if CLUSTER in infra_config[ENVIRONMENT] else default.IOTLAB_CLUSTER
-
-    #     _job_name = infra_config[ENVIRONMENT].get(JOB_NAME, default.JOB_NAME)
-    #     _walltime = infra_config[ENVIRONMENT].get(WALLTIME, default.WALLTIME)
-    #     _cluster = infra_config[ENVIRONMENT].get(CLUSTER, default.IOTLAB_CLUSTER)
-
-    #     config = en.IotlabConf.from_settings(
-    #         job_name=(
-    #             f"{_job_name}_{optimization_id}"
-    #             if optimization_id is not None
-    #             else _job_name
-    #         ),
-    #         walltime=_walltime,
-    #     )
-
-    #     """
-    #         MONITORING
-    #     """
-    #     if MONITORING_IOT_SVC in infra_config:
-    #         for profile in infra_config[MONITORING_IOT_SVC][MONITORING_IOT_PROFILES]:
-    #             period = profile[MONITORING_IOT_PERIOD]
-    #             average = profile[MONITORING_IOT_AVERAGE]
-    #             if profile not in MONITORING_IOT_PERIOD_VALS:
-    #                 def_period = default.IOT_PERIOD_VAL
-    #                 logger.warning(
-    #                     "Invalid Iotlab monitor period: "
-    #                     f"{period} defaulted to: {def_period}"
-    #                 )
-    #                 period = def_period
-    #             if average not in MONITORING_IOT_AVERAGE_VALS:
-    #                 def_average = MONITORING_IOT_AVERAGE_VALS[1]
-    #                 logger.warning(
-    #                     "Invalid Iotlab monitor average: "
-    #                     f"{average} defaulted to: {def_average}"
-    #                 )
-    #                 average = def_average
-    #             config.add_profile(
-    #                 name=profile[NAME],
-    #                 archi=profile[ARCHI],
-    #                 consumption=ConsumptionConfiguration(
-    #                     current=(
-    #                         True
-    #                         if MONITORING_IOT_CURRENT in profile
-    #                         and profile[MONITORING_IOT_CURRENT]
-    #                         else False
-    #                     ),
-    #                     power=(
-    #                         True
-    #                         if MONITORING_IOT_POWER in profile
-    #                         and profile[MONITORING_IOT_POWER]
-    #                         else False
-    #                     ),
-    #                     voltage=(
-    #                         True
-    #                         if MONITORING_IOT_VOLTAGE in profile
-    #                         and profile[MONITORING_IOT_VOLTAGE]
-    #                         else False
-    #                     ),
-    #                     period=period,
-    #                     average=average,
-    #                 ),
-    #             )
-
-    #     """
-    #         REQUEST RESOURCES
-    #     """
-    #     for layer in infra_config[LAYERS]:
-    #         for service in layer[SERVICES]:
-    #             if not self.monitoring_provider:
-    #                 self.monitoring_provider = True if "profile" in service else False
-    #             add_cluster, add_servers = self.check_service_mapping(service)
-    #             if add_cluster is None and add_servers is None:
-    #                 add_cluster = _cluster
-    #             if add_servers is not None:
-    #                 config.add_machine(
-    #                     roles=[service[NAME], layer[NAME], service["_id"]]
-    #                     + service.get(ROLES, []),
-    #                     hostname=add_servers,
-    #                     image=service[IMAGE] if IMAGE in service else None,
-    #                     profile=service["profile"] if "profile" in service else None,
-    #                 )
-    #             else:
-    #                 config.add_machine(
-    #                     roles=[service[NAME], layer[NAME], service["_id"]]
-    #                     + service.get(ROLES, []),
-    #                     archi=service[ARCHI],
-    #                     site=add_cluster,
-    #                     number=(
-    #                         service[QUANTITY]
-    #                         if QUANTITY in service
-    #                         else default.NODE_QUANTITY
-    #                     ),
-    #                     image=service[IMAGE] if IMAGE in service else None,
-    #                     profile=service["profile"] if "profile" in service else None,
-    #                 )
-
-    #     conf = config.finalize()
-    #     logger.debug(f"IOT LAB [conf.to_dict()] = {conf.to_dict()}")
-    #     provider = en.Iotlab(conf)
-    #     return provider
-
     def _provider_iotlab(self, optimization_id: Optional[int] = None) -> en.Iotlab:
         self.config.init(optimization_id=optimization_id)
         self.config.config_provenance()