Merge pull request #58 from fabric-testbed/rel1.8

Rel1.8 - API changes for advance reservations

.swagger-codegen/VERSION

@@ -1 +1 @@
-3.0.54
+3.0.63

docs/MetricsApi.md

@@ -11,7 +11,7 @@ Method | HTTP request | Description
 
 Control Framework metrics overview
 
-Control Framework  metrics overview
+Control Framework metrics overview
 
 ### Example
 ```python

docs/SlicesApi.md

@@ -76,7 +76,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **slices_creates_post**
-> Slivers slices_creates_post(body, name, lease_start_time=lease_start_time, lease_end_time=lease_end_time)
+> Slivers slices_creates_post(body, name, lifetime=lifetime, lease_start_time=lease_start_time, lease_end_time=lease_end_time)
 
 Create slice
 
@@ -101,12 +101,13 @@ configuration.api_key['Authorization'] = 'YOUR_API_KEY'
 api_instance = SlicesApi(ApiClient(configuration))
 body = SlicesPost() # SlicesPost | Create new Slice
 name = 'name_example' # str | Slice Name
+lifetime = 24 # int | Lifetime of the slice requested in hours. (optional) (default to 24)
 lease_start_time = 'lease_start_time_example' # str | Lease End Time for the Slice (optional)
 lease_end_time = 'lease_end_time_example' # str | Lease End Time for the Slice (optional)
 
 try:
     # Create slice
-    api_response = api_instance.slices_creates_post(body, name, lease_start_time=lease_start_time, lease_end_time=lease_end_time)
+    api_response = api_instance.slices_creates_post(body, name, lifetime=lifetime, lease_start_time=lease_start_time, lease_end_time=lease_end_time)
     pprint(api_response)
 except ApiException as e:
     print("Exception when calling SlicesApi->slices_creates_post: %s\n" % e)
@@ -118,6 +119,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **body** | [**SlicesPost**](SlicesPost.md)| Create new Slice | 
  **name** | **str**| Slice Name | 
+ **lifetime** | **int**| Lifetime of the slice requested in hours. | [optional] [default to 24]
  **lease_start_time** | **str**| Lease End Time for the Slice | [optional] 
  **lease_end_time** | **str**| Lease End Time for the Slice | [optional] 
 

fabric_cf/__init__.py

@@ -1 +1 @@
-__version__ = "1.7.3"
+__version__ = "1.8.0"

fabric_cf/orchestrator/orchestrator_proxy.py

@@ -138,7 +138,7 @@ def __set_tokens(self, *, token: str):
 
     def create(self, *, token: str, slice_name: str, ssh_key: Union[str, List[str]],
                topology: ExperimentTopology = None, slice_graph: str = None, lease_start_time: str = None,
-               lease_end_time: str = None) -> Tuple[Status, Union[Exception, List[Sliver]]]:
+               lease_end_time: str = None, lifetime: int = 24) -> Tuple[Status, Union[Exception, List[Sliver]]]:
         """
         Create a slice
         @param token fabric token
@@ -148,6 +148,7 @@ def create(self, *, token: str, slice_name: str, ssh_key: Union[str, List[str]],
         @param slice_graph Slice Graph string
         @param lease_start_time Lease Start Time
         @param lease_end_time Lease End Time
+        @param slice lifetime in hours
         @return Tuple containing Status and Exception/Json containing slivers created
         """
         if token is None:
@@ -190,7 +191,8 @@ def create(self, *, token: str, slice_name: str, ssh_key: Union[str, List[str]],
             body = SlicesPost(graph_model=slice_graph, ssh_keys=ssh_keys)
             slivers = self.slices_api.slices_creates_post(name=slice_name, body=body,
                                                           lease_end_time=lease_end_time,
-                                                          lease_start_time=lease_start_time)
+                                                          lease_start_time=lease_start_time,
+                                                          lifetime=lifetime)
             return Status.OK, slivers.data if slivers.data is not None else []
         except Exception as e:
             return Status.FAILURE, e

fabric_cf/orchestrator/swagger_client/api/slices_api.py

@@ -160,6 +160,7 @@ def slices_creates_post(self, body, name, **kwargs):  # noqa: E501
         :param async_req bool
         :param SlicesPost body: Create new Slice (required)
         :param str name: Slice Name (required)
+        :param int lifetime: Lifetime of the slice requested in hours.
         :param str lease_start_time: Lease End Time for the Slice
         :param str lease_end_time: Lease End Time for the Slice
         :return: Slivers
@@ -186,14 +187,15 @@ def slices_creates_post_with_http_info(self, body, name, **kwargs):  # noqa: E50
         :param async_req bool
         :param SlicesPost body: Create new Slice (required)
         :param str name: Slice Name (required)
+        :param int lifetime: Lifetime of the slice requested in hours.
         :param str lease_start_time: Lease End Time for the Slice
         :param str lease_end_time: Lease End Time for the Slice
         :return: Slivers
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['body', 'name', 'lease_start_time', 'lease_end_time']  # noqa: E501
+        all_params = ['body', 'name', 'lifetime', 'lease_start_time', 'lease_end_time']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -224,6 +226,8 @@ def slices_creates_post_with_http_info(self, body, name, **kwargs):  # noqa: E50
         query_params = []
         if 'name' in params:
             query_params.append(('name', params['name']))  # noqa: E501
+        if 'lifetime' in params:
+            query_params.append(('lifetime', params['lifetime']))  # noqa: E501
         if 'lease_start_time' in params:
             query_params.append(('lease_start_time', params['lease_start_time']))  # noqa: E501
         if 'lease_end_time' in params:

pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
     "six >= 1.10",
     "python_dateutil >= 2.5.3",
     "requests>=2.28.1",
-    "fabric-fim==1.7.2",
+    "fabric-fim==1.8.0",
     ]
 
 [project.optional-dependencies]