Skip to content

Commit 8ff0d9e

Browse files
committed
customize the demo name
1 parent ca7a0c6 commit 8ff0d9e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

netfoundry/ctl.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ def list(cli, spinner: object = None):
545545
cli.log.warn("try 'get' command to get by id")
546546
if cli.args.output == "text":
547547
if not stdout.isatty():
548-
cli.log.warning("use --output=yaml or json for scripting nfctl")
548+
cli.log.warning(f"use --output=yaml or json for scripting {cli.prog_name}")
549549
else: # output is YAML or JSON
550550
# don't emit INFO messages to stdout because they will break deserialization
551551
cli.log.setLevel(logging.WARN)
@@ -746,11 +746,12 @@ def delete(cli):
746746
sysexit(1)
747747

748748

749+
@cli.argument("-p", "--prefix", default=f"{cli.prog_name}-demo", help="choose a network name prefix to identify all of your demos")
749750
@cli.argument("-j", "--jwt", action="store_boolean", default=True, help="save the one-time enroll token for each demo identity in the current directory")
750751
@cli.argument("-s", "--size", default="small", help=argparse.SUPPRESS) # troubleshoot scale-up instance size factor
751752
@cli.argument("-v", "--product-version", default="default", help="network product version: 'default', 'latest', or any active semver")
752-
@cli.argument("--provider", default="AWS", required=False, help="cloud provider to host edge routers", choices=DC_PROVIDERS)
753-
@cli.argument("--regions", dest="regions", default=["us-west-1"], nargs="+", help="cloud location codes in which to host edge routers")
753+
@cli.argument("--provider", default="AWS", help="cloud provider for hosted edge routers", choices=DC_PROVIDERS)
754+
@cli.argument("--regions", dest="regions", default=["us-west-1"], nargs="+", help="provider regions for hosted edge routers")
754755
@cli.subcommand('create a functioning demo network')
755756
def demo(cli):
756757
"""Create a demo network or add demo resources to existing network."""
@@ -764,7 +765,7 @@ def demo(cli):
764765
friendly_words_filename = path.join(resources_dir, "friendly-words/generated/words.json")
765766
with open(friendly_words_filename, 'r') as friendly_words_path:
766767
friendly_words = json_load(friendly_words_path)
767-
network_name = f"nfctl-demo-{choice(friendly_words['predicates'])}-{choice(friendly_words['objects'])}"
768+
network_name = f"{cli.config.demo.prefix}-{choice(friendly_words['predicates'])}-{choice(friendly_words['objects'])}"
768769
demo_confirmed = False
769770
if cli.config.general.yes:
770771
demo_confirmed = True

0 commit comments

Comments
 (0)