Merge branch 'release-v5.5.2'

Author: qrkourier

netfoundry/ctl.py

@@ -671,7 +671,7 @@ def use_network(organization: object, network: str=None, group: str=None, operat
             existing_networks = network_group.networks_by_name()
         else:
             existing_networks = organization.get_networks_by_organization()
-        cli.log.error("need --network to configure a network")
+        cli.log.error("need 'nfctl --network NETWORK' or 'nfctl config general.network=NETWORK' to configure a network")
         exit(1)
     if group:
         network_group = use_network_group(organization=organization, group=group)

netfoundry/network.py

@@ -482,7 +482,7 @@ def get_resources(self, type: str, accept: str=None, deleted: bool=False, **kwar
             params = {
                 "networkId": self.id,
                 "page": 0,
-                "size": 100,
+                "size": 1000,
             }
             # if type == "services": 
             #     params["beta"] = ''

netfoundry/network_group.py

@@ -3,7 +3,7 @@
 import json
 import logging
 
-from .utility import RESOURCES, STATUS_CODES, Utility, eprint, http, is_uuidv4
+from .utility import RESOURCES, STATUS_CODES, Utility, http, is_uuidv4
 
 utility = Utility()
 
@@ -129,7 +129,7 @@ def get_controller_data_centers(self):
                 all_data_centers = json.loads(response.text)['_embedded']['dataCenters']
                 aws_data_centers = [dc for dc in all_data_centers if dc['provider'] == "AWS"]
             except ValueError as e:
-                eprint('ERROR getting data centers')
+                logging.error('failed to find data centers')
                 raise(e)
         else:
             raise Exception(
@@ -161,7 +161,7 @@ def get_product_metadata(self, is_active: bool=True):
             try:
                 product_metadata = json.loads(response.text)
             except ValueError as e:
-                eprint('ERROR getting product metadata')
+                logging.error('failed to find product metadata')
                 raise(e)
         else:
             raise Exception(

netfoundry/organization.py

@@ -623,7 +623,10 @@ def get_network_groups_by_organization(self, **kwargs):
 
         :param str kwargs: filter results by any supported query param
         """
-        params = dict()
+        params = {
+            'size': 1000,
+            'page': 0
+        }
         for param in kwargs.keys():
             params[param] = kwargs[param]            
         try:
@@ -642,10 +645,10 @@ def get_network_groups_by_organization(self, **kwargs):
 
         if response_code == STATUS_CODES.codes.OK: # HTTP 200
             try:
-                network_groups = json.loads(response.text)['_embedded']['organizations']
-            except ValueError as e:
+                response_object = response.json()
+            except ValueError:
                 logging.error('failed loading list of network groups as object')
-                raise(e)
+                raise ValueError("response is not JSON")
         else:
             raise Exception(
                 'ERROR: got unexpected HTTP code {:s} ({:d}) and response {:s}'.format(
@@ -654,6 +657,50 @@ def get_network_groups_by_organization(self, **kwargs):
                     response.text
                 )
             )
+
+        total_pages = response_object['page']['totalPages']
+        total_elements = response_object['page']['totalElements']
+        # if there are no resources
+        if total_elements == 0:
+            return([])
+        else:
+            network_groups = response_object['_embedded'][RESOURCES['network-groups']['embedded']]
+
+        # if there is one page of resources
+        if total_pages == 1:
+            return network_groups
+        # if there are multiple pages of resources
+        else:
+            # append the remaining pages of resources
+            for page in range(1,total_pages+1): # +1 to work around 1-base bug in MOP-17890
+                try:
+                    params["page"] = page
+                    response = http.get(
+                        self.audience+'rest/v1/network-groups',
+                        proxies=self.proxies,
+                        verify=self.verify,
+                        headers=headers,
+                        params=params
+                    )
+                    response_code = response.status_code
+                except:
+                    raise
+                if response_code == STATUS_CODES.codes.OK: # HTTP 200
+                    try:
+                        response_object = response.json()
+                        network_groups.extend(response_object['_embedded'][RESOURCES['network-groups']['embedded']])
+                    except ValueError:
+                        logging.error('failed loading list of network groups as object')
+                        raise ValueError("response is not JSON")
+                else:
+                    raise Exception(
+                        'ERROR: got unexpected HTTP code {:s} ({:d}) and response {:s}'.format(
+                            STATUS_CODES._codes[response_code][0].upper(),
+                            response_code,
+                            response.text
+                        )
+                    )
+
         return(network_groups)
 
     network_groups = get_network_groups_by_organization

setup.py

@@ -30,7 +30,8 @@
         'milc >= 1.6',
         'pyyaml >= 5.4',
         'platformdirs >= 2.4',
-        'tabulate >= 0.8'
+        'tabulate >= 0.8',
+        'packaging >= 20.9'
     ]
 )