finish cleaning up references to old network-groups API endpoint

Author: qrkourier

netfoundry/ctl.py

@@ -156,7 +156,7 @@ def login(cli):
                 summary_table = []
                 summary_table.append(['Caller ID', f"{summary_object['caller']['name']} ({summary_object['caller']['email']}) in {organization.label} ({organization.name})"])
                 if network_group:
-                    summary_table.append(['Network Resource Group', f"{summary_object['network_group']['name']} ({summary_object['network_group']['organizationShortName']}) with {summary_object['network_group']['networks_count']} networks"])
+                    summary_table.append(['Network Resource Group', f"{summary_object['network_group']['name']} ({summary_object['network_group']['shortName']}) with {summary_object['network_group']['networks_count']} networks"])
                 if network:
                     summary_table.append(['Configured Network', f"{summary_object['network']['name']} - {summary_object['network']['productVersion']} - {summary_object['network']['status']}"])
                 if cli.config.general.borders:
@@ -687,13 +687,11 @@ def list(cli, echo: bool = True, spinner: object = None):
         valid_keys = valid_keys.union(match.keys())
 
     # intersection of the set of valid, observed keys in the first match
-    default_keys = ['name', 'label', 'organizationShortName', 'type', 'description',
+    default_keys = ['name', 'label', 'shortName', 'type', 'description',
                     'edgeRouterAttributes', 'serviceAttributes', 'endpointAttributes',
                     'status', 'zitiId', 'provider', 'locationCode', 'ipAddress', 'networkVersion',
                     'active', 'default', 'region', 'size', 'attributes', 'email', 'productVersion',
                     'address', 'binding', 'component']
-    if cli.config.list.names:  # include identity IDs if --names
-        default_keys.extend(IDENTITY_ID_PROPERTIES)
     if cli.args.keys:
         valid_keys = valid_keys.intersection(cli.args.keys)
     else:

netfoundry/network_group.py

@@ -28,14 +28,14 @@ def __init__(self, Organization: object, network_group_id: str = None, network_g
             self.network_group_id = network_group_id
             network_group_matches = [ng for ng in self.network_groups if ng['id'] == network_group_id]
             if len(network_group_matches) == 1:
-                self.network_group_name = network_group_matches[0]['organizationShortName']
+                self.network_group_name = network_group_matches[0]['shortName']
                 self.logger.debug(f"found one match for group id '{network_group_id}'")
             else:
                 raise RuntimeError(f"there was not exactly one network group matching the id '{network_group_id}'")
         # TODO: review the use of org short name ref https://mattermost.tools.netfoundry.io/netfoundry/pl/gegyzuybypb9jxnrw1g1imjywh
         elif network_group_name:
             self.network_group_name = network_group_name
-            network_group_matches = [ng for ng in self.network_groups if caseless_equal(ng['organizationShortName'], self.network_group_name)]
+            network_group_matches = [ng for ng in self.network_groups if caseless_equal(ng['shortName'], self.network_group_name)]
             if len(network_group_matches) == 1:
                 self.network_group_id = network_group_matches[0]['id']
                 self.logger.debug(f"found one match for group short name '{network_group_name}'")
@@ -44,10 +44,10 @@ def __init__(self, Organization: object, network_group_id: str = None, network_g
         elif len(self.network_groups) > 0:
             # first network group is typically the only network group
             self.network_group_id = self.network_groups[0]['id']
-            self.network_group_name = normalize_caseless(self.network_groups[0]['organizationShortName'])
+            self.network_group_name = normalize_caseless(self.network_groups[0]['shortName'])
             # warn if there are other groups
             if len(self.network_groups) > 1:
-                self.logger.warning(f"using first network group {self.network_group_name} and ignoring {len(self.network_groups) - 1} other(s) e.g. {self.network_groups[1]['organizationShortName']}, etc...")
+                self.logger.warning(f"using first network group {self.network_group_name} and ignoring {len(self.network_groups) - 1} other(s) e.g. {self.network_groups[1]['shortName']}, etc...")
             elif len(self.network_groups) == 1:
                 self.logger.debug(f"using the only available network group: {self.network_group_name}")
         else:

netfoundry/organization.py

@@ -80,7 +80,12 @@ def __init__(self,
             else:
                 self.verify = False
 
-        self.gateway = gateway
+        # users of older versions of nfsupport-cli will send literal None until they upgrade to a version that provides the --gateway option
+        if gateway is None:
+            self.gateway = "gateway"
+        else:
+            self.gateway = gateway
+
         self.logger.debug(f"got 'gateway' param {self.gateway}")
 
         epoch = round(time.time())
@@ -554,7 +559,7 @@ def get_network_group(self, network_group_id):
 
         :param network_group_id: the UUID of the network group
         """
-        url = self.audience+'rest/v1/network-groups/'+network_group_id
+        url = self.audience+'core/v2/network-groups/'+network_group_id
         try:
             network_group, status_symbol = get_generic_resource_by_url(setup=self, url=url)
         except Exception as e:
@@ -595,7 +600,7 @@ def find_network_groups_by_organization(self, **kwargs):
 
         :param str kwargs: filter results by any supported query param
         """
-        url = self.audience+'rest/v1/network-groups'
+        url = self.audience+'core/v2/network-groups'
         network_groups = list()
         for i in find_generic_resources(setup=self, url=url, embedded=RESOURCES['network-groups']._embedded, **kwargs):
             network_groups.extend(i)

netfoundry/utility.py

@@ -319,8 +319,15 @@ def create_generic_resource(setup: object, url: str, body: dict, headers: dict =
         proxies=setup.proxies,
         verify=setup.verify,
     )
-    if response.status_code in range(400, 600):
-        setup.logger.debug(response.request)
+    if response.status_code in range(200, 600):
+        req = response.request
+        setup.logger.debug(
+            '%s\n%s\r\n%s\r\n\r\n%s',
+            '-----------START-----------',
+            req.method + ' ' + req.url,
+            '\r\n'.join('{}: {}'.format(k, v) for k, v in req.headers.items()),
+            req.body
+        )
     response.raise_for_status()
     resource = response.json()
 
@@ -456,8 +463,6 @@ def find_generic_resources(setup: object, url: str, headers: dict = dict(), embe
     # only get requested page, else first page and all pages
     if params.get('page'):
         get_all_pages = False
-    elif resource_type.name == 'network-groups':
-        params['page'] = 1           # start at 1 instead of 0 to workaround https://netfoundry.atlassian.net/browse/MOP-17890
     else:
         params['page'] = 0
 
@@ -660,6 +665,8 @@ def __post_init__(self):
         if self.find_url == 'default':
             if self.domain == 'network':
                 setattr(self, 'find_url', f'core/v2/{self.name}')
+            elif self.domain == 'network-group':
+                setattr(self, 'find_url', f'core/v2/{self.name}')
             elif self.domain == 'identity':
                 setattr(self, 'find_url', f'identity/v1/{self.name}')
             elif self.domain == 'authorization':
@@ -717,10 +724,8 @@ def __post_init__(self):
     'network-groups': ResourceType(
         name='network-groups',
         domain='network-group',
-        _embedded='organizations',
         mutable=False,
         embeddable=False,
-        find_url='rest/v1/network-groups',
     ),
     'networks': ResourceType(
         name='networks',