resource naming enhancement and bug fix

Author: ojninja16

sebs/aws/aws.py

@@ -393,12 +393,13 @@ def default_function_name(
         self,code_package: Benchmark, resources: Optional[Resources] = None
     ) -> str:
         # Create function name
+        resource_id = resources.resources_id if resources else self.config.resources.resources_id
         func_name = "{}-{}-{}-{}-{}".format(
+                resource_id,
                 code_package.benchmark,
                 code_package.language_name,
                 code_package.language_version,
                 code_package.architecture,
-                self.config.resources.resources_id,
             )
         if code_package.container_deployment:
             func_name = f"{func_name}-docker"

sebs/azure/azure.py

@@ -331,10 +331,10 @@ def default_function_name(
         """
         func_name = (
             "{}-{}-{}-{}".format(
+                self.config.resources.resources_id,
                 code_package.benchmark,
                 code_package.language_name,
                 code_package.language_version,
-                self.config.resources.resources_id,
             )
             .replace(".", "-")
             .replace("_", "-")

sebs/gcp/gcp.py

@@ -108,11 +108,12 @@ def default_function_name(
         self,code_package: Benchmark, resources: Optional[Resources] = None
     ) -> str:
         # Create function name
+        resource_id = resources.resources_id if resources else self.config.resources.resources_id
         func_name = "{}-{}-{}-{}".format(
+                resource_id,
                 code_package.benchmark,
                 code_package.language_name,
                 code_package.language_version,
-                self.config.resources.resources_id,
             )
         return GCP.format_function_name(func_name)
 

sebs/local/local.py

@@ -348,10 +348,10 @@ def default_function_name(
         # Create function name
         if resources is not None:
             func_name = "{}-{}-{}-{}".format(
+                resources.resources_id,
                 code_package.benchmark,
                 code_package.language_name,
                 code_package.language_version,
-                resources.resources_id,
             )
         else:
             func_name = "{}-{}-{}".format(

sebs/openwhisk/openwhisk.py

@@ -325,16 +325,11 @@ def is_configuration_changed(self, cached_function: Function, benchmark: Benchma
     def default_function_name(
         self, code_package: Benchmark, resources: Optional[Resources] = None
     ) -> str:
-        if resources is not None:
-            return (
-                f"{code_package.benchmark}-{code_package.language_name}-"
-                f"{code_package.language_version}-{resources.resources_id}"
-            )
+        resource_id = resources.resources_id if resources else self.config.resources.resources_id
         return (
-            f"{code_package.benchmark}-{code_package.language_name}-"
-            f"{code_package.language_version}"
-        )
-
+                f"{resource_id}-{code_package.benchmark}-"
+                f"{code_package.language_name}-{code_package.language_version}"
+            )
     def enforce_cold_start(self, functions: List[Function], code_package: Benchmark):
         raise NotImplementedError()