From c819046739fd891c2f2306efa8372a0f57864dae Mon Sep 17 00:00:00 2001 From: Komal Thareja Date: Fri, 6 Sep 2024 14:12:34 -0400 Subject: [PATCH 1/3] request only slice state --- fabric_cf/__init__.py | 2 +- fabric_cf/orchestrator/orchestrator_proxy.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fabric_cf/__init__.py b/fabric_cf/__init__.py index 3c1e9cb..f797838 100644 --- a/fabric_cf/__init__.py +++ b/fabric_cf/__init__.py @@ -1 +1 @@ -__version__ = "1.7.1" +__version__ = "1.7.2b0" diff --git a/fabric_cf/orchestrator/orchestrator_proxy.py b/fabric_cf/orchestrator/orchestrator_proxy.py index 1e0e96f..bfff8dd 100644 --- a/fabric_cf/orchestrator/orchestrator_proxy.py +++ b/fabric_cf/orchestrator/orchestrator_proxy.py @@ -287,7 +287,8 @@ def delete(self, *, token: str, slice_id: str = None) -> Tuple[Status, Union[Exc def slices(self, *, token: str, includes: List[SliceState] = None, excludes: List[SliceState] = None, name: str = None, limit: int = 20, offset: int = 0, slice_id: str = None, - as_self: bool = True, search: str = None, exact_match: bool = False) -> Tuple[Status, Union[Exception, List[Slice]]]: + as_self: bool = True, search: str = None, exact_match: bool = False, + graph_format: str = GraphFormat.GRAPHML.name) -> Tuple[Status, Union[Exception, List[Slice]]]: """ Get slices @param token fabric token @@ -300,6 +301,7 @@ def slices(self, *, token: str, includes: List[SliceState] = None, excludes: Lis @param as_self query as self @param search search term @param exact_match true if exact match + @param graph_format graph_format @return Tuple containing Status and Exception/Json containing slices """ if token is None: @@ -322,7 +324,7 @@ def slices(self, *, token: str, includes: List[SliceState] = None, excludes: Lis states.remove(x) if slice_id is not None: - slices = self.slices_api.slices_slice_id_get(slice_id=slice_id, graph_format=GraphFormat.GRAPHML.name, + slices = self.slices_api.slices_slice_id_get(slice_id=slice_id, graph_format=graph_format, as_self=as_self) elif name is not None: slices = self.slices_api.slices_get(states=SliceState.state_list_to_str_list(states), name=name, From 73fc1a96e86d566fa9562d167f04af03076f6c49 Mon Sep 17 00:00:00 2001 From: Komal Thareja Date: Mon, 9 Sep 2024 12:04:46 -0400 Subject: [PATCH 2/3] up version --- fabric_cf/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric_cf/__init__.py b/fabric_cf/__init__.py index f797838..1db13ec 100644 --- a/fabric_cf/__init__.py +++ b/fabric_cf/__init__.py @@ -1 +1 @@ -__version__ = "1.7.2b0" +__version__ = "1.7.2" From bb34466572cd9dfdc6fa3c36721438f7986bcf9a Mon Sep 17 00:00:00 2001 From: Komal Thareja Date: Wed, 2 Oct 2024 14:21:03 -0400 Subject: [PATCH 3/3] up the version --- fabric_cf/__init__.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric_cf/__init__.py b/fabric_cf/__init__.py index 1db13ec..008aaa9 100644 --- a/fabric_cf/__init__.py +++ b/fabric_cf/__init__.py @@ -1 +1 @@ -__version__ = "1.7.2" +__version__ = "1.7.3" diff --git a/pyproject.toml b/pyproject.toml index 6f092ae..3b6cf23 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ dependencies = [ "six >= 1.10", "python_dateutil >= 2.5.3", "requests>=2.28.1", - "fabric-fim==1.7.1", + "fabric-fim==1.7.2", ] [project.optional-dependencies]