fix(Forc):fixed forc security group

deNBI · Jul 18, 2023 · 64fb60e · 64fb60e
1 parent bd5ac11
commit 64fb60e
Show file tree

Hide file tree

Showing 4 changed files with 6,637 additions and 2,401 deletions.
diff --git a/portal_client.thrift b/portal_client.thrift
@@ -407,7 +407,9 @@ service VirtualMachineService {
 
      7:list<map<string,string>> volume_ids_path_new,
      8:list<map<string,string>> volume_ids_path_attach,
-     9:list <string> additional_keys
+     9:list <string> additional_keys,
+     10:optional string research_environment
+
     )
 
     throws (1:NameAlreadyUsedException e,2:ResourceNotAvailableException r,5:ImageNotFoundException i,6:FlavorNotFoundException f,7:DefaultException o)

diff --git a/simple_vm_client/VirtualMachineHandler.py b/simple_vm_client/VirtualMachineHandler.py
@@ -307,15 +307,16 @@ def start_server(
         volume_ids_path_new: list[dict[str, str]],
         volume_ids_path_attach: list[dict[str, str]],
         additional_keys: list[str],
+        research_environment: str,
     ) -> str:
-        # if research_environment:
-        #     research_environment_metadata = (
-        #         self.forc_connector.get_metadata_by_research_environment(
-        #             research_environment=research_environment
-        #         )
-        #     )
-        # else:
-        #     research_environment_metadata = None
+        if research_environment:
+            research_environment_metadata = (
+                self.forc_connector.get_metadata_by_research_environment(
+                    research_environment=research_environment
+                )
+            )
+        else:
+            research_environment_metadata = None
         return self.openstack_connector.start_server(
             flavor_name=flavor_name,
             image_name=image_name,
@@ -325,7 +326,7 @@ def start_server(
             volume_ids_path_new=volume_ids_path_new,
             volume_ids_path_attach=volume_ids_path_attach,
             additional_keys=additional_keys,
-            # research_environment_metadata=research_environment_metadata,
+            research_environment_metadata=research_environment_metadata,
         )
 
     def start_server_with_custom_key(