Merge branch 'release-v5.9.4'

Author: qrkourier

netfoundry/ctl.py

@@ -540,7 +540,7 @@ def get(cli, echo: bool = True, spinner: object = None):
                         cli.log.warn(f"using 'id' only, ignoring params: '{', '.join(query_keys)}'")
                     match = network.get_resource_by_id(type=cli.args.resource_type, id=cli.args.query['id'], accept=cli.args.accept)
                 else:
-                    matches = network.find_resources(type=cli.args.resource_type, accept=cli.args.accept, **cli.args.query)
+                    matches = network.find_resources(type=cli.args.resource_type, accept=cli.args.accept, params=cli.args.query)
                     if len(matches) == 1:
                         match = matches[0]
 
@@ -669,7 +669,7 @@ def list(cli, spinner: object = None):
             if cli.args.resource_type == "data-centers":
                 matches = network.find_edge_router_data_centers(**cli.args.query)
             else:
-                matches = network.find_resources(type=cli.args.resource_type, accept=cli.args.accept, **cli.args.query)
+                matches = network.find_resources(type=cli.args.resource_type, accept=cli.args.accept, params=cli.args.query)
 
     if len(matches) == 0:
         spinner.fail(f"Found no {cli.args.resource_type} by '{', '.join(query_keys)}'")

netfoundry/network.py

@@ -383,7 +383,7 @@ def get_resource_by_id(self, type: str, id: str, accept: str = None):
         return(resource)
     get_resource = get_resource_by_id
 
-    def find_resources(self, type: str, accept: str = None, deleted: bool = False, **kwargs):
+    def find_resources(self, type: str, accept: str = None, deleted: bool = False, params: dict = dict(), **kwargs):
         """Find resources by type.
 
         :param str type: plural of an entity type in the network domain e.g. networks, endpoints, services, posture-checks, etc...
@@ -399,7 +399,6 @@ def find_resources(self, type: str, accept: str = None, deleted: bool = False, *
         if type == "data-centers":
             self.logger.warn("don't call network.get_resources() for data centers, always use network.get_edge_router_data_centers() to filter for locations that support this network's version")
 
-        params = dict()
         for param in kwargs.keys():
             params[param] = kwargs[param]
         if not plural(type) == 'networks':

netfoundry/network_group.py

@@ -14,7 +14,7 @@ def __init__(self, Organization: object, network_group_id: str = None, network_g
         """Initialize the network group class with a group name or ID."""
         self.logger = Organization.logger
         self.Networks = Networks(Organization)
-        self.network_groups = Organization.get_network_groups_by_organization()
+        self.network_groups = Organization.find_network_groups_by_organization()
         if (not network_group_id and not network_group_name) and group:
             if is_uuidv4(group):
                 network_group_id = group

netfoundry/utility.py

@@ -396,7 +396,7 @@ def find_generic_resources(url: str, headers: dict, embedded: str = None, proxie
             if get_all_pages:           # this is False if param 'page' or 'size' to stop recursion or get a single page
                 if resource_type.name == 'network-groups':
                     params['page'] = 1  # workaround API bug https://netfoundry.atlassian.net/browse/MOP-17890
-                    next_range_lower, next_range_upper = params['page'] + 2, total_pages + 1
+                    next_range_lower, next_range_upper = params['page'], total_pages + 1
                 else:
                     next_range_lower, next_range_upper = params['page'] + 1, total_pages
                 for next_page in range(next_range_lower, next_range_upper):  # first page is 0 unless network-groups which are 1-based
@@ -436,6 +436,7 @@ def camel(self, snake_str):
 
 
 NET_RESOURCES = dict()             # resources in network domain
+ZITI_NET_RESOURCES = dict()        # network resources that are backed 1:1 by a zitiId
 MUTABLE_NET_RESOURCES = dict()     # network resources that can be updated
 MUTABLE_RESOURCE_ABBREV = dict()   # unique abbreviations for ^
 EMBED_NET_RESOURCES = dict()       # network resources that may be fetched as embedded collections
@@ -484,9 +485,8 @@ def __post_init__(self):
 class ResourceType(ResourceTypeParent):
     """Typed resource type spec.
 
-    As close as I could get to a Go struct. This helps us to suggest possible
-    operations such as all resource types in the network domain that can be
-    mutated (C_UD).
+    This helps the CLI to suggest possible operations such as all resource
+    types in the network domain that can be mutated (C_UD).
     """
 
     name: str                                               # plural form as kebab-case e.g. edge-routers
@@ -509,6 +509,7 @@ class ResourceType(ResourceTypeParent):
     abbreviation: str = field(default='default')
     status_symbols: dict = field(default_factory=lambda: RESOURCE_STATUS_SYMBOLS)  # dictionary with three predictable keys: complete, progress, error, each a tuple associating status symbols with a state
     host: bool = field(default=False)                       # may have a managed host in NF cloud
+    ziti: bool = field(default=False)
 
     def __post_init__(self):
         """Compute and assign _embedded if not supplied and then check types in parent class."""
@@ -534,6 +535,8 @@ def __post_init__(self):
             if self.host:
                 HOSTABLE_NET_RESOURCES[self.name] = self
                 HOSTABLE_RESOURCE_ABBREV[self.abbreviation] = self
+            if self.ziti:
+                ZITI_NET_RESOURCES[self.name] = self
         return super().__post_init__()
 
 
@@ -650,7 +653,9 @@ def __post_init__(self):
             "attributes": [],
             "enrollmentMethod": {"ott": True},
             "name": "Name"
-        }),
+        },
+        ziti=True,
+        ),
     'edge-routers': ResourceType(
         name='edge-routers',
         domain='network',
@@ -659,6 +664,7 @@ def __post_init__(self):
         no_update_props=['registration'],
         create_responses=["ACCEPTED"],
         host=True,
+        ziti=True,
     ),
     'edge-router-policies': ResourceType(
         name='edge-router-policies',
@@ -673,13 +679,15 @@ def __post_init__(self):
         mutable=True,
         embeddable=True,
         create_responses=["ACCEPTED"],
+        ziti=True,
     ),
     'service-policies': ResourceType(
         name='service-policies',
         domain='network',
         mutable=True,
         embeddable=True,
         create_responses=["ACCEPTED"],
+        ziti=True,
     ),
     'app-wans': ResourceType(
         name='app-wans',
@@ -695,41 +703,47 @@ def __post_init__(self):
         mutable=True,
         embeddable=True,
         create_responses=["ACCEPTED"],
+        ziti=True,
     ),
     'posture-checks': ResourceType(
         name='posture-checks',
         domain='network',
         mutable=True,
         embeddable=True,
         create_responses=["ACCEPTED"],
+        ziti=True,
     ),
     'certificate-authorities': ResourceType(
         name='certificate-authorities',
         domain='network',
         mutable=True,
         embeddable=True,
         create_responses=["ACCEPTED"],
+        ziti=True,
     ),
     'config-types': ResourceType(
         name='config-types',
         domain='network',
         mutable=True,
         embeddable=True,
         create_responses=["ACCEPTED"],
+        ziti=True,
     ),
     'configs': ResourceType(
         name='configs',
         domain='network',
         mutable=True,
         embeddable=True,
         create_responses=["ACCEPTED"],
+        ziti=True,
     ),
     'terminators': ResourceType(
         name='terminators',
         domain='network',
         mutable=True,
         embeddable=True,
         create_responses=["ACCEPTED"],
+        ziti=True,
     ),
 }