Add in option to report internal IP (--report_internal_ip).
--report_internal_ip will report the internal IP instead of the external
IP. This is needed when someone is connecting to the AVD GCE instance from
another GCE instance.
Note: I ignored pylint duplicate code errors since common_operations,
create_cuttlefish_action, and create_goldfish_action are so similar. The
create work will refactor out the common code into 1 place so it's safe
to ignore for now.
Bug: 113535553
Test: ./run_tests.sh and acloud create
m acloud_test && acloud_test
Change-Id: I6ac840048eb0854f7dcdc223b846826e266b0ad5
diff --git a/public/acloud_main.py b/public/acloud_main.py
index e3e8196..23a73b2 100644
--- a/public/acloud_main.py
+++ b/public/acloud_main.py
@@ -436,7 +436,8 @@
cleanup=not args.no_cleanup,
serial_log_file=args.serial_log_file,
logcat_file=args.logcat_file,
- autoconnect=args.autoconnect)
+ autoconnect=args.autoconnect,
+ report_internal_ip=args.report_internal_ip)
elif args.which == create_args.CMD_CREATE:
create.Run(args)
elif args.which == CMD_CREATE_CUTTLEFISH:
@@ -448,7 +449,8 @@
num=args.num,
serial_log_file=args.serial_log_file,
logcat_file=args.logcat_file,
- autoconnect=args.autoconnect)
+ autoconnect=args.autoconnect,
+ report_internal_ip=args.report_internal_ip)
elif args.which == CMD_CREATE_GOLDFISH:
report = create_goldfish_action.CreateDevices(
cfg=cfg,
@@ -460,7 +462,8 @@
serial_log_file=args.serial_log_file,
logcat_file=args.logcat_file,
autoconnect=args.autoconnect,
- branch=args.branch)
+ branch=args.branch,
+ report_internal_ip=args.report_internal_ip)
elif args.which == CMD_DELETE:
report = device_driver.DeleteAndroidVirtualDevices(
cfg, args.instance_names)