Merge branch 'release-v5.8.17'

Author: qrkourier

netfoundry/ctl.py

@@ -163,21 +163,39 @@ def login(cli):
                 table = tabulate(tabular_data=summary_table, headers=['Domain', 'Summary'], tablefmt=table_borders)
                 if cli.config.general.color:
                     highlighted = highlight(table, text_lexer, Terminal256Formatter(style=cli.config.general.style))
-                    cli.echo(highlighted)
+                    try:
+                        cli.echo(highlighted)
+                    except ValueError:
+                        print(highlighted)
                 else:
-                    cli.echo(table)
+                    try:
+                        cli.echo(table)
+                    except ValueError:
+                        print(table)
             elif cli.args.output == "yaml":
                 if cli.config.general.color:
                     highlighted = highlight(yaml_dumps(summary_object, indent=4), yaml_lexer, Terminal256Formatter(style=cli.config.general.style))
-                    cli.echo(highlighted)
+                    try:
+                        cli.echo(highlighted)
+                    except ValueError:
+                        print(highlighted)
                 else:
-                    cli.echo(yaml_dumps(summary_object, indent=4))
+                    try:
+                        cli.echo(yaml_dumps(summary_object, indent=4))
+                    except ValueError:
+                        print(yaml_dumps(summary_object, indent=4))
             elif cli.args.output == "json":
                 if cli.config.general.color:
                     highlighted = highlight(json_dumps(summary_object, indent=4), json_lexer, Terminal256Formatter(style=cli.config.general.style))
-                    cli.echo(highlighted)
+                    try:
+                        cli.echo(highlighted)
+                    except ValueError:
+                        print(highlighted)
                 else:
-                    cli.echo(json_dumps(summary_object, indent=4))
+                    try:
+                        cli.echo(json_dumps(summary_object, indent=4))
+                    except ValueError:
+                        print(json_dumps(summary_object, indent=4))
         else:             # if eval
             nonf = """
 # helper function logs out from NetFoundry
@@ -212,9 +230,15 @@ def login(cli):
 """
             if cli.config.general.color:
                 highlighted = highlight(token_env, bash_lexer, Terminal256Formatter(style=cli.config.general.style))
-                cli.echo(highlighted)
+                try:
+                    cli.echo(highlighted)
+                except ValueError:
+                    print(highlighted)
             else:
-                cli.echo(token_env)
+                try:
+                    cli.echo(token_env)
+                except ValueError:
+                    print(token_env)
 
 
 @cli.subcommand('logout your identity for the current current profile')
@@ -541,15 +565,27 @@ def get(cli, echo: bool = True, spinner: object = None):
             if cli.args.output in ["yaml", "text"]:
                 if cli.config.general.color:
                     highlighted = highlight(yaml_dumps(filtered_match, indent=4), yaml_lexer, Terminal256Formatter(style=cli.config.general.style))
-                    cli.echo(highlighted)
+                    try:
+                        cli.echo(highlighted)
+                    except ValueError:
+                        print(highlighted)
                 else:
-                    cli.echo(yaml_dumps(filtered_match, indent=4))
+                    try:
+                        cli.echo(yaml_dumps(filtered_match, indent=4))
+                    except ValueError:
+                        print(yaml_dumps(filtered_match, indent=4))
             elif cli.args.output == "json":
                 if cli.config.general.color:
                     highlighted = highlight(json_dumps(filtered_match, indent=4), json_lexer, Terminal256Formatter(style=cli.config.general.style))
-                    cli.echo(highlighted)
+                    try:
+                        cli.echo(highlighted)
+                    except ValueError:
+                        print(highlighted)
                 else:
-                    cli.echo(json_dumps(filtered_match, indent=4))
+                    try:
+                        cli.echo(json_dumps(filtered_match, indent=4))
+                    except ValueError:
+                        print(json_dumps(filtered_match, indent=4))
     elif len(matches) == 0:
         cli.log.warn(f"found no {cli.args.resource_type} by '{', '.join(query_keys)}'")
         sysexit(1)
@@ -651,7 +687,7 @@ def list(cli, spinner: object = None):
                            'edgeRouterAttributes', 'serviceAttributes', 'endpointAttributes',
                            'status', 'zitiId', 'provider', 'locationCode', 'ipAddress', 'networkVersion',
                            'active', 'default', 'region', 'size', 'attributes', 'email', 'productVersion',
-                           'state']
+                           'state', 'address', 'binding']
         valid_keys = set(matches[0].keys()) & set(default_columns)
 
     if valid_keys:
@@ -688,15 +724,27 @@ def list(cli, spinner: object = None):
     elif cli.args.output == "yaml":
         if cli.config.general.color:
             highlighted = highlight(yaml_dumps(filtered_matches, indent=4), yaml_lexer, Terminal256Formatter(style=cli.config.general.style))
-            cli.echo(highlighted)
+            try:
+                cli.echo(highlighted)
+            except ValueError:
+                print(highlighted)
         else:
-            cli.echo(yaml_dumps(filtered_matches, indent=4))
+            try:
+                cli.echo(yaml_dumps(filtered_matches, indent=4))
+            except ValueError:
+                print(yaml_dumps(filtered_matches, indent=4))
     elif cli.args.output == "json":
         if cli.config.general.color:
             highlighted = highlight(json_dumps(filtered_matches, indent=4), json_lexer, Terminal256Formatter(style=cli.config.general.style))
-            cli.echo(highlighted)
+            try:
+                cli.echo(highlighted)
+            except ValueError:
+                print(highlighted)
         else:
-            cli.echo(json_dumps(filtered_matches, indent=4))
+            try:
+                cli.echo(json_dumps(filtered_matches, indent=4))
+            except ValueError:
+                print(json_dumps(filtered_matches, indent=4))
 
 
 @cli.argument('query', arg_only=True, action=StoreDictKeyPair, nargs='?', help="query params as k=v,k=v comma-separated pairs")

netfoundry/organization.py

@@ -592,8 +592,9 @@ def get_network(self, network_id: str, embed: object = None, accept: str = None)
             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))]
+                valid_types = ['all']
+            else:
+                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}'")
 

netfoundry/utility.py

@@ -330,10 +330,8 @@ def find_generic_resources(url: str, headers: dict, embedded: str = None, proxie
     # normalize output with a default sort param
     if not params.get('sort'):
         params["sort"] = "name,asc"
-    # workaround sort param bug in MOP-18018
-    if resource_type.name in ['identities', 'user-identities', 'api-account-identities']:
-        del params['sort']
-    elif resource_type.name == 'hosts':      # workaround sort param bug in MOP-17863
+    # workaround sort param bugs in MOP-18018, MOP-17863, MOP-18178
+    if resource_type.name in ['identities', 'user-identities', 'api-account-identities', 'hosts', 'terminators']:
         del params['sort']
 
     # only get one page of the requested size, else default page size and all pages
@@ -706,7 +704,28 @@ def __post_init__(self):
         mutable=True,
         embeddable=True,
         create_responses=["ACCEPTED"],
-    )
+    ),
+    'config-types': ResourceType(
+        name='config-types',
+        domain='network',
+        mutable=True,
+        embeddable=True,
+        create_responses=["ACCEPTED"],
+    ),
+    'configs': ResourceType(
+        name='configs',
+        domain='network',
+        mutable=True,
+        embeddable=True,
+        create_responses=["ACCEPTED"],
+    ),
+    'terminators': ResourceType(
+        name='terminators',
+        domain='network',
+        mutable=True,
+        embeddable=True,
+        create_responses=["ACCEPTED"],
+    ),
 }
 
 # TODO: [MOP-13441] associate locations with a short list of major geographic regions / continents