From 3c52b6cf4dc003c2a19c41db814c2dd82f735f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20Vol=C3=A1k?= Date: Wed, 28 Feb 2024 09:26:40 +0100 Subject: [PATCH] Revert "Changes due to changes in RM2.0.0 (#78)" This reverts commit 22d56d05fd8142c01b05585c1b8f1ff078180176. --- .../resource_manager_worker.py | 90 +++++++------------ .../Allocate_IPv4_Prefix_Resource.json | 12 +-- .../Allocate_IPv4_Resource.json | 10 +-- .../Allocate_IPv6_Prefix_Resource.json | 12 +-- .../Allocate_IPv6_Resource.json | 10 +-- .../Create_IPv4_Pool.json | 2 +- .../Create_IPv4_Prefix_Pool.json | 2 +- .../Create_IPv6_Pool.json | 2 +- .../Create_IPv6_Prefix_Pool.json | 2 +- .../Create_Subnet.json | 17 ++-- .../Deallocate_Resource.json | 2 +- .../Delete_Pool_IPv4.json | 2 +- .../Delete_Pool_IPv6.json | 2 +- frinx_conductor_workers/setup.py | 2 +- 14 files changed, 71 insertions(+), 96 deletions(-) diff --git a/frinx_conductor_workers/frinx_conductor_workers/resource_manager_worker.py b/frinx_conductor_workers/frinx_conductor_workers/resource_manager_worker.py index c54857f..f081d67 100644 --- a/frinx_conductor_workers/frinx_conductor_workers/resource_manager_worker.py +++ b/frinx_conductor_workers/frinx_conductor_workers/resource_manager_worker.py @@ -60,11 +60,7 @@ }, resourceTypeId: $resource_type_id) { - edges { - node { - id - } - } + id } }""" ) @@ -85,14 +81,10 @@ """ query SearchPools($poolTag: String!) { SearchPoolsByTags(tags: { matchesAny: [{matchesAll: [$poolTag]}]}) { - edges { - node { - id - AllocationStrategy {Name} - Name - PoolProperties - } - } + id + AllocationStrategy {Name} + Name + PoolProperties } } """ ) @@ -224,18 +216,14 @@ """ query getEmptyPools($resourceTypeId: ID) { QueryEmptyResourcePools(resourceTypeId: $resourceTypeId) { - edges { - node { - id - Name - Tags { - Tag - } - AllocationStrategy { - Name - } - } - } + id + Name + Tags { + Tag + } + AllocationStrategy { + Name + } } }""" ) @@ -727,18 +715,14 @@ def query_pool(task, logs): Returns: Response from uniresource. Worker output format:: - "result": { - "data": { - "QueryResourcePools": { - "edges": [ - { - "node": { - "id": "" - } - } - ] - } - } + "result":{ + "data": { + "QueryResourcePools": [ + { + "id": "" + } + ] + } } """ @@ -816,18 +800,14 @@ def query_pool_by_tag(task, logs): Response from uniresource. Worker output format:: "result": { "data": { - "SearchPoolsByTags": { - "edges": [ - { - "node": { + "SearchPoolsByTags": [ + { "id": "", "AllocationStrategy": "Name": "" "PoolProperties": - } - } - ] - } + } + ] } } @@ -1415,18 +1395,14 @@ def query_search_empty_pools(task, logs): Response from uniresource. Worker output format:: "result": { "data": { - "QueryEmptyResourcePools": { - "edges": [ - { - "node": { - "id": "", - "AllocationStrategy": - "Name": "" - "Tags": - } - } - ] - } + "QueryEmptyResourcePools": [ + { + "id": "", + "AllocationStrategy": + "Name": "" + "Tags": + } + ] } } diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv4_Prefix_Resource.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv4_Prefix_Resource.json index 680a0eb..14a2b66 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv4_Prefix_Resource.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv4_Prefix_Resource.json @@ -17,7 +17,7 @@ "name": "decisionTask", "taskReferenceName": "pool_exists", "inputParameters": { - "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges}" + "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags}" }, "type": "DECISION", "caseExpression": "$.pool_exists.length > 0 ? 'True' : 'False'", @@ -48,8 +48,8 @@ "name": "LAMBDA_TASK", "taskReferenceName": "lambda_print_alt_id", "inputParameters": { - "address": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.address}", - "prefix": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.prefix}", + "address": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.address}", + "prefix": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.prefix}", "scriptExpression": "return {'subnetAddress': $.address, 'subnetPrefix': $.prefix}" }, "type": "LAMBDA", @@ -67,7 +67,7 @@ "name": "RESOURCE_MANAGER_calculate_desired_size_from_prefix", "taskReferenceName": "calculate_desired_size_from_prefix", "inputParameters": { - "subnet": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.subnet}", + "subnet": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.subnet}", "prefix": "${workflow.input.prefix}", "resourceType": "ipv4_prefix" }, @@ -92,7 +92,7 @@ "taskReferenceName": "claim_resource_with_desired_value", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "userInput": {"desiredValue": "${workflow.input.desired_value}", "desiredSize": "${calculate_desired_size_from_prefix.output.result.data}"}, "description": "${workflow.input.description}", "alternativeId": "${lambda_print_alt_id.output.result}" @@ -105,7 +105,7 @@ "taskReferenceName": "claim_resource_without_desired_value", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "userInput": {"desiredSize": "${calculate_desired_size_from_prefix.output.result.data}"}, "description": "${workflow.input.description}", "alternativeId": "${lambda_print_alt_id.output.result}" diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv4_Resource.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv4_Resource.json index 77e1054..a37fe97 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv4_Resource.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv4_Resource.json @@ -17,7 +17,7 @@ "name": "decisionTask", "taskReferenceName": "pool_exists", "inputParameters": { - "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges}" + "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags}" }, "type": "DECISION", "caseExpression": "$.pool_exists.length > 0 ? 'True' : 'False'", @@ -48,8 +48,8 @@ "name": "LAMBDA_TASK", "taskReferenceName": "lambda_print_alt_id", "inputParameters": { - "address": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.address}", - "prefix": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.prefix}", + "address": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.address}", + "prefix": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.prefix}", "scriptExpression": "return {'subnetAddress': $.address, 'subnetPrefix': $.prefix}" }, "type": "LAMBDA", @@ -79,7 +79,7 @@ "taskReferenceName": "claim_resource_with_desired_value", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "userInput": {"desiredValue": "${workflow.input.desired_value}"}, "description": "${workflow.input.description}", "alternativeId": "${lambda_print_alt_id.output.result}" @@ -92,7 +92,7 @@ "taskReferenceName": "claim_resource_without_desired_value", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "description": "${workflow.input.description}", "alternativeId": "${lambda_print_alt_id.output.result}" } diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv6_Prefix_Resource.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv6_Prefix_Resource.json index d62a2b4..cecad03 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv6_Prefix_Resource.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv6_Prefix_Resource.json @@ -17,7 +17,7 @@ "name": "decisionTask", "taskReferenceName": "pool_exists", "inputParameters": { - "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges}" + "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags}" }, "type": "DECISION", "caseExpression": "$.pool_exists.length > 0 ? 'True' : 'False'", @@ -48,8 +48,8 @@ "name": "LAMBDA_TASK", "taskReferenceName": "lambda_print_alt_id", "inputParameters": { - "address": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.address}", - "prefix": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.prefix}", + "address": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.address}", + "prefix": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.prefix}", "scriptExpression": "return {'subnetAddress': $.address, 'subnetPrefix': $.prefix}" }, "type": "LAMBDA", @@ -67,7 +67,7 @@ "name": "RESOURCE_MANAGER_calculate_desired_size_from_prefix", "taskReferenceName": "calculate_desired_size_from_prefix", "inputParameters": { - "subnet": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.subnet}", + "subnet": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.subnet}", "prefix": "${workflow.input.prefix}", "resourceType": "ipv6_prefix" }, @@ -92,7 +92,7 @@ "taskReferenceName": "claim_resource_with_desired_value", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "userInput": {"desiredValue": "${workflow.input.desired_value}", "desiredSize": "${calculate_desired_size_from_prefix.output.result.data}"}, "description": "${workflow.input.description}", "alternativeId": "${lambda_print_alt_id.output.result}" @@ -105,7 +105,7 @@ "taskReferenceName": "claim_resource_without_desired_value", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "userInput": {"desiredSize": "${calculate_desired_size_from_prefix.output.result.data}"}, "description": "${workflow.input.description}", "alternativeId": "${lambda_print_alt_id.output.result}" diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv6_Resource.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv6_Resource.json index a04e574..4374fca 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv6_Resource.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv6_Resource.json @@ -17,7 +17,7 @@ "name": "decisionTask", "taskReferenceName": "pool_exists", "inputParameters": { - "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges}" + "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags}" }, "type": "DECISION", "caseExpression": "$.pool_exists.length > 0 ? 'True' : 'False'", @@ -48,8 +48,8 @@ "name": "LAMBDA_TASK", "taskReferenceName": "lambda_print_alt_id", "inputParameters": { - "address": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.address}", - "prefix": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.prefix}", + "address": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.address}", + "prefix": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.prefix}", "scriptExpression": "return {'subnetAddress': $.address, 'subnetPrefix': $.prefix}" }, "type": "LAMBDA", @@ -79,7 +79,7 @@ "taskReferenceName": "claim_resource_with_desired_value", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "userInput": {"desiredValue": "${workflow.input.desired_value}"}, "description": "${workflow.input.description}", "alternativeId": "${lambda_print_alt_id.output.result}" @@ -92,7 +92,7 @@ "taskReferenceName": "claim_resource_without_desired_value", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "description": "${workflow.input.description}", "alternativeId": "${lambda_print_alt_id.output.result}" } diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv4_Pool.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv4_Pool.json index e8ddf9c..fafa71a 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv4_Pool.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv4_Pool.json @@ -17,7 +17,7 @@ "name": "decisionTask", "taskReferenceName": "pool_exists", "inputParameters": { - "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges}" + "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags}" }, "type": "DECISION", "caseExpression": "$.pool_exists.length > 0 ? 'True' : 'False'", diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv4_Prefix_Pool.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv4_Prefix_Pool.json index fe29a95..2761150 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv4_Prefix_Pool.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv4_Prefix_Pool.json @@ -17,7 +17,7 @@ "name": "decisionTask", "taskReferenceName": "pool_exists", "inputParameters": { - "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges}" + "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags}" }, "type": "DECISION", "caseExpression": "$.pool_exists.length > 0 ? 'True' : 'False'", diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv6_Pool.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv6_Pool.json index a340a79..9b7d52e 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv6_Pool.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv6_Pool.json @@ -17,7 +17,7 @@ "name": "decisionTask", "taskReferenceName": "pool_exists", "inputParameters": { - "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges}" + "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags}" }, "type": "DECISION", "caseExpression": "$.pool_exists.length > 0 ? 'True' : 'False'", diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv6_Prefix_Pool.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv6_Prefix_Pool.json index 66bdd62..6198792 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv6_Prefix_Pool.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv6_Prefix_Pool.json @@ -17,7 +17,7 @@ "name": "decisionTask", "taskReferenceName": "pool_exists", "inputParameters": { - "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges}" + "pool_exists": "${query_pool_by_tag.output.result.data.SearchPoolsByTags}" }, "type": "DECISION", "caseExpression": "$.pool_exists.length > 0 ? 'True' : 'False'", diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_Subnet.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_Subnet.json index 7080f83..337f8e2 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_Subnet.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_Subnet.json @@ -15,8 +15,8 @@ "name": "LAMBDA_TASK", "taskReferenceName": "lambda_print_alt_id", "inputParameters": { - "address": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.address}", - "prefix": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.prefix}", + "address": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.address}", + "prefix": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].PoolProperties.prefix}", "scriptExpression": "return {'subnetAddress': $.address, 'subnetPrefix': $.prefix}" }, "type": "LAMBDA", @@ -34,9 +34,8 @@ "name": "RESOURCE_MANAGER_calculate_desired_size_from_prefix", "taskReferenceName": "calculate_desired_size_from_prefix", "inputParameters": { - "subnet": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.PoolProperties.subnet}", "prefix": "${workflow.input.prefix}", - "resourceType": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.AllocationStrategy.Name}" + "resourceType": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].AllocationStrategy.Name}" }, "type": "SIMPLE", "startDelay": 0, @@ -78,7 +77,7 @@ "taskReferenceName": "decision_pool_type", "caseExpression": "$.poolType.startsWith(\"ipv4_prefix\") ? 'ipv4_prefix' : $.poolType.startsWith(\"ipv6_prefix\") ? 'ipv6_prefix' : 'defaultCase';", "inputParameters": { - "poolType": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.AllocationStrategy.Name}" + "poolType": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].AllocationStrategy.Name}" }, "decisionCases": { "ipv4_prefix": [ @@ -98,7 +97,7 @@ "taskReferenceName": "claim_resource_ipv4_desiredValue", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "hostAddress" : "${workflow.input.subnet_ip_address}", "userInput": {"desiredSize": "${calculate_desired_size_from_prefix.output.result.data}", "desiredValue": "${workflow.input.subnet_ip_address}"}, "description": "parent resource for nested pool", @@ -112,7 +111,7 @@ "taskReferenceName": "claim_resource_ipv4", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "userInput": {"desiredSize": "${calculate_desired_size_from_prefix.output.result.data}"}, "description": "parent resource for nested pool", "alternativeId": "${lambda_print_alt_id.output.result}" @@ -191,7 +190,7 @@ "taskReferenceName": "claim_resource_ipv6_desiredValue", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "hostAddress" : "${workflow.input.subnet_ip_address}", "userInput": {"desiredSize": "${calculate_desired_size_from_prefix.output.result.data}", "desiredValue": "${workflow.input.subnet_ip_address}"}, "description": "parent resource for nested pool", @@ -205,7 +204,7 @@ "taskReferenceName": "claim_resource_ipv6", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "userInput": {"desiredSize": "${calculate_desired_size_from_prefix.output.result.data}"}, "description": "parent resource for nested pool", "alternativeId": "${lambda_print_alt_id.output.result}" diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Deallocate_Resource.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Deallocate_Resource.json index 1c4ac2b..d297b35 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Deallocate_Resource.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Deallocate_Resource.json @@ -17,7 +17,7 @@ "taskReferenceName": "deallocate_resource", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}", + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}", "userInput": {"address": "${workflow.input.ip_address}"} } } diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Delete_Pool_IPv4.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Delete_Pool_IPv4.json index 610787f..507fb21 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Delete_Pool_IPv4.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Delete_Pool_IPv4.json @@ -17,7 +17,7 @@ "taskReferenceName": "delete_pool", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}" + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}" } } ], diff --git a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Delete_Pool_IPv6.json b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Delete_Pool_IPv6.json index 839a89b..4c0d11e 100644 --- a/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Delete_Pool_IPv6.json +++ b/frinx_conductor_workers/frinx_conductor_workflows/resource_manager_workflows/Delete_Pool_IPv6.json @@ -17,7 +17,7 @@ "taskReferenceName": "delete_pool", "type": "SIMPLE", "inputParameters": { - "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags.edges[0].node.id}" + "poolId": "${query_pool_by_tag.output.result.data.SearchPoolsByTags[0].id}" } } ], diff --git a/frinx_conductor_workers/setup.py b/frinx_conductor_workers/setup.py index 3c6dbcb..1a45290 100644 --- a/frinx_conductor_workers/setup.py +++ b/frinx_conductor_workers/setup.py @@ -10,7 +10,7 @@ def __read__(file_name): setup( name="frinx_conductor_workers", packages=["frinx_conductor_workers", "frinx_conductor_workflows"], - version="1.1.13", + version="1.1.12", description="Conductor python client workers", author="Frinx", author_email="info@frinx.io",