Merge branch 'release-v5.8.16'

Author: qrkourier

netfoundry/ctl.py

@@ -238,7 +238,8 @@ def logout(cli):
 
 
 @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', metavar="RESOURCE_TYPE", choices=[choice for group in [[singular(type), MUTABLE_NET_RESOURCES[type].abbreviation] for type in MUTABLE_NET_RESOURCES.keys()] for choice in group])
+@cli.argument('resource_type', arg_only=True, help='type of resource', metavar="RESOURCE_TYPE",
+              choices=[choice for group in [[singular(type), MUTABLE_NET_RESOURCES[type].abbreviation] for type in MUTABLE_NET_RESOURCES.keys()] for choice in group])
 # this allows us to pass the edit subcommand's cli object to function get without further modifying that functions params
 @cli.subcommand('duplicate a resource')
 def copy(cli):
@@ -269,7 +270,8 @@ def copy(cli):
 
 
 @cli.argument('-f', '--file', help='JSON or YAML file', type=argparse.FileType('r', encoding='UTF-8'))
-@cli.argument('resource_type', arg_only=True, help='type of resource', metavar="RESOURCE_TYPE", choices=[choice for group in [[singular(type), RESOURCES[type].abbreviation] for type in MUTABLE_NET_RESOURCES.keys()] for choice in group])
+@cli.argument('resource_type', arg_only=True, help='type of resource', metavar="RESOURCE_TYPE",
+              choices=[choice for group in [[singular(type), RESOURCES[type].abbreviation] for type in MUTABLE_NET_RESOURCES.keys()] for choice in group])
 @cli.subcommand('create a resource from a file')
 def create(cli):
     """Create a resource.
@@ -341,7 +343,8 @@ def create(cli):
 
 
 @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', metavar="RESOURCE_TYPE", choices=[choice for group in [[singular(type), RESOURCES[type].abbreviation] for type in MUTABLE_NET_RESOURCES.keys()] for choice in group])
+@cli.argument('resource_type', arg_only=True, help='type of resource', metavar="RESOURCE_TYPE",
+              choices=[choice for group in [[singular(type), RESOURCES[type].abbreviation] for type in MUTABLE_NET_RESOURCES.keys()] for choice in group])
 # this allows us to pass the edit subcommand's cli object to function get without further modifying that functions params
 @cli.subcommand('edit a resource with EDITOR')
 def edit(cli):
@@ -375,8 +378,11 @@ def edit(cli):
 @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('-k', '--keys', arg_only=True, action=StoreListKeys, help="list of keys as a,b,c to print only selected keys (columns)")
 @cli.argument('-a', '--as', dest='accept', arg_only=True, choices=['create'], help="request the as=create alternative form of the resource")
-@cli.argument('-e', '--embed', arg_only=True, action=StoreListKeys, default=None, help="applies to 'get network': optionally embed comma-sep list of resource types or 'all' of a network's resource collections", choices=[plural(type) for type in EMBED_NET_RESOURCES.keys()])
-@cli.argument('resource_type', arg_only=True, help='type of resource', metavar="RESOURCE_TYPE", choices=[choice for group in [[singular(type), RESOURCES[type].abbreviation] for type in RESOURCES.keys()] for choice in group])
+@cli.argument('-e', '--embed', arg_only=True, nargs='+',
+              help="applies to 'get network': optionally embed space-sep list of resource types or 'all' of a network's resource collections",
+              choices=[plural(type) for type in EMBED_NET_RESOURCES.keys()].extend('all'))
+@cli.argument('resource_type', arg_only=True, help='type of resource', metavar="RESOURCE_TYPE",
+              choices=[choice for group in [[singular(type), RESOURCES[type].abbreviation] for type in RESOURCES.keys()] for choice in group])
 @cli.subcommand('get a single resource by type and query')
 def get(cli, echo: bool = True, spinner: object = None):
     """
@@ -559,7 +565,8 @@ def get(cli, echo: bool = True, spinner: object = None):
 @cli.argument('-k', '--keys', arg_only=True, action=StoreListKeys, help="list of keys as a,b,c to print only selected keys (columns)")
 @cli.argument('-m', '--my-roles', arg_only=True, action='store_true', help="filter roles by caller identity")
 @cli.argument('-a', '--as', dest='accept', arg_only=True, choices=['create'], help="request the as=create alternative form of the resources")
-@cli.argument('resource_type', arg_only=True, help='type of resource', metavar="RESOURCE_TYPE", choices=[choice for group in [[type, RESOURCES[type].abbreviation] for type in RESOURCES.keys()] for choice in group])
+@cli.argument('resource_type', arg_only=True, help='type of resource', metavar="RESOURCE_TYPE",
+              choices=[choice for group in [[type, RESOURCES[type].abbreviation] for type in RESOURCES.keys()] for choice in group])
 @cli.subcommand(description='find a collection of resources by type and query')
 def list(cli, spinner: object = None):
     """Find resources as lists."""
@@ -693,7 +700,8 @@ def list(cli, spinner: object = None):
 
 
 @cli.argument('query', arg_only=True, action=StoreDictKeyPair, nargs='?', help="query params as k=v,k=v comma-separated pairs")
-@cli.argument('resource_type', arg_only=True, help='type of resource', choices=[choice for group in [[singular(type), RESOURCES[type].abbreviation] for type in RESOURCES.keys()] for choice in group])
+@cli.argument('resource_type', arg_only=True, help='type of resource',
+              choices=[choice for group in [[singular(type), RESOURCES[type].abbreviation] for type in RESOURCES.keys()] for choice in group])
 @cli.subcommand('delete a single resource by type and query')
 def delete(cli):
     """Delete a resource in the network domain."""

netfoundry/organization.py

@@ -572,7 +572,7 @@ def get_network_group(self, network_group_id):
         else:
             return(network_group)
 
-    def get_network(self, network_id: str, embed: str = None, accept: str = None):
+    def get_network(self, network_id: str, embed: object = None, accept: str = None):
         """Describe a Network by ID.
 
         :param str network_id: UUIDv4 of the network to get
@@ -584,16 +584,18 @@ def get_network(self, network_id: str, embed: str = None, accept: str = None):
         headers = dict()
         headers["authorization"] = "Bearer " + self.token
         params = dict()
-        if embed == "all":
-            params['embed'] = ', '.join(EMBED_NET_RESOURCES)
-            self.logger.debug(f"requesting embed all resource types in network domain: {params['embed']}")
-        elif embed:
-            valid_types = [plural(type) for type in embed.split(',') if RESOURCES[plural(type)]['domain'] == "network"]
-            params['embed'] = ', '.join(valid_types)
-            self.logger.debug(f"requesting embed some resource types in network domain: {valid_types}")
-            for type in embed.split(','):
-                if not NET_RESOURCES.get(type):
-                    self.logger.warn(f"not requesting '{type}', not a resource type in the network domain")
+        requested_types = list()
+        valid_types = set()
+        if embed:
+            if isinstance(embed, list):
+                requested_types.extend(embed)
+            else:
+                requested_types.extend(embed.split(','))
+            if 'all' in requested_types:
+                requested_types.extend(EMBED_NET_RESOURCES.keys())
+            valid_types = [plural(type) for type in requested_types if EMBED_NET_RESOURCES.get(plural(type))]
+            params['embed'] = ','.join(valid_types)
+            self.logger.debug(f"requesting embed of: '{valid_types}'")
 
         url = self.audience+'core/v2/networks/'+network_id
         network, status_symbol = get_generic_resource(url=url, headers=headers, accept=accept, proxies=self.proxies, verify=self.verify, **params)