Revert "Changes due to changes in RM2.0.0 (#78)"

This reverts commit 22d56d0.
FRINXio · Feb 28, 2024 · 3c52b6c · 3c52b6c
1 parent 22d56d0
commit 3c52b6c
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 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
@@ -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": "<id>"
-                            }
-                          }
-                        ]
-                    }
-                }
+            "result":{
+              "data": {
+                "QueryResourcePools": [
+                  {
+                    "id": "<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": "<id>",
                             "AllocationStrategy": <Name>
                             "Name": "<name>"
                             "PoolProperties": <PoolProperties>
-                            }
-                          }
-                        ]
-                    }
+                        }
+                    ]
                 }
             }
 
@@ -1415,18 +1395,14 @@ def query_search_empty_pools(task, logs):
             Response from uniresource. Worker output format::
             "result": {
                 "data": {
-                    "QueryEmptyResourcePools": {
-                        "edges": [
-                          {
-                            "node": {
-                              "id": "<id>",
-                              "AllocationStrategy": <Name>
-                              "Name": "<name>"
-                              "Tags": <tag>
-                            }
-                          }
-                        ]
-                    }
+                    "QueryEmptyResourcePools": [
+                        {
+                            "id": "<id>",
+                            "AllocationStrategy": <Name>
+                            "Name": "<name>"
+                            "Tags": <tag>
+                        }
+                    ]
                 }
             }
 

diff --git a/...s/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv4_Prefix_Resource.json b/...s/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/..._workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv4_Resource.json b/..._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/...s/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv6_Prefix_Resource.json b/...s/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/..._workers/frinx_conductor_workflows/resource_manager_workflows/Allocate_IPv6_Resource.json b/..._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/...ductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv4_Pool.json b/...ductor_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/...workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv4_Prefix_Pool.json b/...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/...ductor_workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv6_Pool.json b/...ductor_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/...workers/frinx_conductor_workflows/resource_manager_workflows/Create_IPv6_Prefix_Pool.json b/...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'",