finish defining the network domain of resources

Author: qrkourier

netfoundry/ctl.py

@@ -59,7 +59,7 @@ def __call__(self, parser, namespace, values, option_string=None):
         """Split comma-separated list elements."""
         setattr(namespace, self.dest, values.split(','))
 
-@cli.argument('-p','--profile', default='nfctl', help='login profile for storing and retrieving concurrent, discrete sessions')
+@cli.argument('-p','--profile', default='default', help='login profile for storing and retrieving concurrent, discrete sessions')
 @cli.argument('-C', '--credentials', help='API account JSON file from web console')
 @cli.argument('-O', '--organization', help="label or ID of an alternative organization (default is caller's org)" )
 @cli.argument('-N', '--network', help='caseless name of the network to manage')
@@ -348,7 +348,7 @@ def create(cli):
         resource = network.create_resource(type=cli.args.resource_type, properties=create_object, wait=cli.config.create.wait)
 
 @cli.argument('query', arg_only=True, action=StoreDictKeyPair, nargs='?', help="id=UUIDv4 or query params as k=v,k=v comma-separated pairs")
-@cli.argument('resource_type', arg_only=True, help='type of resource', choices=NETWORK_RESOURCES.keys())
+@cli.argument('resource_type', arg_only=True, help='type of resource', choices=[singular(type) for type in NETWORK_RESOURCES.keys()])
 # this allows us to pass the edit subcommand's cli object to function get without further modifying that functions params
 @cli.argument('-a', '--accept', arg_only=True, default='update', help=argparse.SUPPRESS)
 @cli.subcommand('edit a single resource selected by query with editor defined in NETFOUNDRY_EDITOR or EDITOR')
@@ -591,7 +591,10 @@ def delete(cli):
         if not cli.args.query:
             cli.log.error("need query to select a resource")
             exit(1)
-        matches = network.get_resources(type=cli.args.resource_type, **cli.args.query)
+        if 'id' in cli.args.query.keys():
+            matches = [network.get_resource_by_id(type=cli.args.resource_type, id=cli.args.query['id'])]
+        else:
+            matches = network.get_resources(type=cli.args.resource_type, **cli.args.query)
         if len(matches) == 0:
             cli.log.info("found no %s '%s'", cli.args.resource_type, str(cli.args.query))
             exit(1)

netfoundry/network.py

@@ -531,11 +531,11 @@ def get_resources(self, type: str, accept: str=None, deleted: bool=False, **kwar
             return([])
         # if there is one page of resources
         elif total_pages == 1:
-            all_entities = resources['_embedded'][RESOURCES[type]['embedded']]
+            all_entities = resources['_embedded'][NETWORK_RESOURCES[type]['embedded']]
         # if there are multiple pages of resources
         else:
             # initialize the list with the first page of resources
-            all_entities = resources['_embedded'][RESOURCES[type]['embedded']]
+            all_entities = resources['_embedded'][NETWORK_RESOURCES[type]['embedded']]
             # append the remaining pages of resources
             for page in range(1,total_pages):
                 try:
@@ -554,7 +554,7 @@ def get_resources(self, type: str, accept: str=None, deleted: bool=False, **kwar
                 if response_code == STATUS_CODES.codes.OK: # HTTP 200
                     try:
                         resources = json.loads(response.text)
-                        all_entities.extend(resources['_embedded'][RESOURCES[type]['embedded']])
+                        all_entities.extend(resources['_embedded'][NETWORK_RESOURCES[type]['embedded']])
                     except ValueError as e:
                         eprint('ERROR: failed to load resources object from GET response')
                         raise(e)
@@ -909,7 +909,7 @@ def create_endpoint(self, name: str, attributes: list=[], session_identity: str=
         started = None
         any_in = lambda a, b: any(i in b for i in a)
         response_code_symbols = [s.upper() for s in STATUS_CODES._codes[response_code]]
-        if any_in(response_code_symbols, RESOURCES['endpoints']['create_responses']):
+        if any_in(response_code_symbols, NETWORK_RESOURCES['endpoints']['create_responses']):
             try:
                 started = json.loads(response.text)
             except ValueError as e:
@@ -1016,7 +1016,7 @@ def create_edge_router(self, name: str, attributes: list=[], link_listener: bool
             raise
         any_in = lambda a, b: any(i in b for i in a)
         response_code_symbols = [s.upper() for s in STATUS_CODES._codes[response_code]]
-        if any_in(response_code_symbols, RESOURCES['edge-routers']['create_responses']):
+        if any_in(response_code_symbols, NETWORK_RESOURCES['edge-routers']['create_responses']):
             try:
                 started = json.loads(response.text)
             except ValueError as e:
@@ -1095,7 +1095,7 @@ def create_edge_router_policy(self, name: str, endpoint_attributes: list=[], edg
             raise
         any_in = lambda a, b: any(i in b for i in a)
         response_code_symbols = [s.upper() for s in STATUS_CODES._codes[response_code]]
-        if any_in(response_code_symbols, RESOURCES['edge-router-policies']['create_responses']):
+        if any_in(response_code_symbols, NETWORK_RESOURCES['edge-router-policies']['create_responses']):
             try:
                 started = json.loads(response.text)
             except ValueError as e:
@@ -1249,7 +1249,7 @@ def create_service_simple(self, name: str, client_host_name: str, client_port: i
             raise
         any_in = lambda a, b: any(i in b for i in a)
         response_code_symbols = [s.upper() for s in STATUS_CODES._codes[response_code]]
-        if any_in(response_code_symbols, RESOURCES['services']['create_responses']):
+        if any_in(response_code_symbols, NETWORK_RESOURCES['services']['create_responses']):
             try:
                 started = json.loads(response.text)
             except ValueError as e:
@@ -1346,7 +1346,7 @@ def create_service_policy(self, name: str, services: list, endpoints: list, type
 
         any_in = lambda a, b: any(i in b for i in a)
         response_code_symbols = [s.upper() for s in STATUS_CODES._codes[response_code]]
-        if any_in(response_code_symbols, RESOURCES['service-policies']['create_responses']):
+        if any_in(response_code_symbols, NETWORK_RESOURCES['service-policies']['create_responses']):
             try:
                 started = json.loads(response.text)
             except ValueError as e:
@@ -1435,7 +1435,7 @@ def create_service_edge_router_policy(self, name: str, services: list, edge_rout
 
         any_in = lambda a, b: any(i in b for i in a)
         response_code_symbols = [s.upper() for s in STATUS_CODES._codes[response_code]]
-        if any_in(response_code_symbols, RESOURCES['service-edge-router-policies']['create_responses']):
+        if any_in(response_code_symbols, NETWORK_RESOURCES['service-edge-router-policies']['create_responses']):
             try:
                 started = json.loads(response.text)
             except ValueError as e:
@@ -1539,7 +1539,7 @@ def create_service_with_configs(self, name: str, intercept_config_data: dict, ho
 
         any_in = lambda a, b: any(i in b for i in a)
         response_code_symbols = [s.upper() for s in STATUS_CODES._codes[response_code]]
-        if any_in(response_code_symbols, RESOURCES['services']['create_responses']):
+        if any_in(response_code_symbols, NETWORK_RESOURCES['services']['create_responses']):
             try:
                 started = json.loads(response.text)
             except ValueError as e:
@@ -1857,7 +1857,7 @@ def create_service_advanced(self, name: str, endpoints: list, client_hosts: list
 
         any_in = lambda a, b: any(i in b for i in a)
         response_code_symbols = [s.upper() for s in STATUS_CODES._codes[response_code]]
-        if any_in(response_code_symbols, RESOURCES['services']['create_responses']):
+        if any_in(response_code_symbols, NETWORK_RESOURCES['services']['create_responses']):
             try:
                 started = json.loads(response.text)
             except ValueError as e:
@@ -1937,7 +1937,7 @@ def create_app_wan(self, name: str, endpoint_attributes: list=[], service_attrib
             raise
         any_in = lambda a, b: any(i in b for i in a)
         response_code_symbols = [s.upper() for s in STATUS_CODES._codes[response_code]]
-        if any_in(response_code_symbols, RESOURCES['app-wans']['create_responses']):
+        if any_in(response_code_symbols, NETWORK_RESOURCES['app-wans']['create_responses']):
             try:
                 started = json.loads(response.text)
             except ValueError as e:
@@ -1960,7 +1960,8 @@ def create_app_wan(self, name: str, endpoint_attributes: list=[], service_attrib
             return(started)
 
     def get_network_by_name(self,name: str,group: str=None):
-        """return exactly one network object
+        """Get one network by name.
+
         :param: name required name of the NF network may contain quoted whitespace
         :param: group optional string UUID to limit results by Network Group ID
         """
@@ -2001,15 +2002,15 @@ def get_network_by_name(self,name: str,group: str=None):
             )
         hits = networks['page']['totalElements']
         if hits == 1:
-            network = networks['_embedded'][RESOURCES['networks']['embedded']][0]
+            network = networks['_embedded'][NETWORK_RESOURCES['networks']['embedded']][0]
             return(network)
         else:
             raise Exception("ERROR: failed to find exactly one match for {}".format(name))
 
     def get_network_by_id(self,network_id):
         """Return the network object for a particular UUID.
 
-            :network_id [required] the UUID of the network
+        :param str network_id: the UUID of the network
         """
         try:
             headers = { 

netfoundry/utility.py

@@ -119,7 +119,7 @@ def singular(plural):
     },
     'networks': {
         'embedded': "networkList",
-        'domain': "network-group",
+        'domain': "network",
         'create_responses': ["ACCEPTED"],
         'create_template': {
             "name": "Name",