revisited cloudlab

fabric-testbed · Mar 10, 2024 · ac87d81 · ac87d81
1 parent b65a472
commit ac87d81
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/fabfed/controller/controller.py b/fabfed/controller/controller.py
@@ -173,12 +173,10 @@ def plan(self, provider_states: List[ProviderState]):
             creation_details['in_config_file'] = True
             creation_details['provider_supports_modifiable'] = provider.supports_modify()
 
-        # for resource in resources:
             if resource.label in resource_state_map:
-                # states = resource_state_map.get(resource.label)
-                # provider_state = states[0].attributes.get(Constants.PROVIDER_STATE)
                 resource_dict = resource.attributes
-                resource_dict[Constants.RES_CREATION_DETAILS].update(provider.saved_state.creation_details[resource.label])
+                resource_dict[Constants.RES_CREATION_DETAILS].update(
+                    provider.saved_state.creation_details[resource.label])
                 resource_dict[Constants.RES_CREATION_DETAILS]['total_count'] = resource_dict[Constants.RES_COUNT]
 
             planned_resources.append(resource)
@@ -187,23 +185,22 @@ def plan(self, provider_states: List[ProviderState]):
             if state_label not in resources_labels:
                 state = states[0]
                 resource_dict = state.attributes.copy()
-                provider_state = resource_dict.pop('provider_state')
+                provider_state = resource_dict.pop(Constants.PROVIDER_STATE)
                 provider = pf.get_provider(label=provider_state.label)
 
-                creation_details = provider_state.creation_details[state_label]
+                import copy
+
+                creation_details: Dict = copy.deepcopy(provider_state.creation_details[state_label])
                 creation_details['in_config_file'] = False
                 creation_details['provider_supports_modifiable'] = provider.supports_modify()
 
                 from ..util.config_models import ProviderConfig
 
                 var_name, _ = tuple(provider_state.label.split('@'))
-
                 provider_config = ProviderConfig(type=provider.type, name=var_name, attrs=provider.config)
 
-                var_name, _ = tuple(state.label.split('@'))
-                # resource_config = ResourceConfig(type=state.type, name=var_name, provider=provider_config,
-                #                                  attrs=resource_dict)
                 resource_dict = {}
+                var_name, _ = tuple(state.label.split('@'))
 
                 if var_name != creation_details['name_prefix']:
                     resource_dict['name'] = creation_details['name_prefix']
@@ -359,8 +356,6 @@ def destroy(self, *, provider_states: List[ProviderState]):
         failed_resources = []
 
         for provider_state in provider_states:
-            key = provider_state.label
-
             for k in provider_state.failed:
                 failed_resources.append(k)
 

diff --git a/fabfed/provider/chi/chi_provider.py b/fabfed/provider/chi/chi_provider.py
@@ -119,7 +119,6 @@ def __get_site_identifier(*, site: str):
 
     def do_add_resource(self, *, resource: dict):
         label = resource[Constants.LABEL]
-        self.logger.info(f"ADDDDDDDDDING {label}")
         rtype = resource[Constants.RES_TYPE]
         site = resource[Constants.RES_SITE]
         self.existing_map[label] = []
@@ -134,7 +133,6 @@ def do_add_resource(self, *, resource: dict):
             else:
                 assert provider_saved_creation_details['total_count'] == 1
                 net_name = f'{self.name}-{resource.get(Constants.RES_NAME_PREFIX)}'
-                self.logger.info(f"WOW ADDDDDDDDDING {label}")
                 self.existing_map[label].append(net_name)
 
         creation_details = resource[Constants.RES_CREATION_DETAILS]

diff --git a/fabfed/provider/fabric/fabric_slice.py b/fabfed/provider/fabric/fabric_slice.py
@@ -1,5 +1,5 @@
 import logging
-from typing import List
+from typing import List, Union
 
 import fabfed.provider.api.dependency_util as util
 from fabfed.model import Node, Network
@@ -21,7 +21,7 @@ def __init__(self, *, provider: FabricProvider, logger: logging.Logger):
 
         from fabrictestbed_extensions.fablib.slice import Slice
 
-        self.slice_object: Slice = None
+        self.slice_object: Union[Slice, None] = None
         self.retry = 10
         self.existing_nodes = []
         self.existing_networks = []
@@ -182,8 +182,7 @@ def _submit_and_wait(self) -> str or None:
 
         self.logger.info(f"Slice provisioning successful {self.slice_object.get_state()}")
 
-        days = DEFAULT_RENEWAL_IN_DAYS
-
+        # days = DEFAULT_RENEWAL_IN_DAYS
         # try:
         #     import datetime
         #     end_date = (datetime.datetime.now() + datetime.timedelta(days=days)).strftime("%Y-%m-%d %H:%M:%S %z")
@@ -440,4 +439,3 @@ def delete_resource(self, *, resource: dict):
             self.slice_object = None
             self.slice_created = False
             self.logger.info(f"Destroyed slice {self.name}")  # TODO EMIT DELETE EVENT
-