Update help message.
Bug: 114315541
Test: m acloud && atest acloud_test &&
$acloud --help
Change-Id: I910be19ee03e15272af11eb9ee092ed84fdafdd2
diff --git a/public/acloud_main.py b/public/acloud_main.py
index b8a137c..e320ea6 100644
--- a/public/acloud_main.py
+++ b/public/acloud_main.py
@@ -13,55 +13,35 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-r"""Cloud Android Driver.
+r"""
+Welcome to
+ ___ _______ ____ __ _____
+ / _ |/ ___/ / / __ \/ / / / _ \
+ / __ / /__/ /__/ /_/ / /_/ / // /
+/_/ |_\___/____/\____/\____/____/
-This CLI manages google compute engine project for android devices.
+
+This a tool to create Android Virtual Devices locally/remotely.
- Prerequisites:
- See: go/acloud-manual
+ The manual will be available at
+ https://android.googlesource.com/platform/tools/acloud/+/master/README.md
-- Configuration:
- The script takes a required configuration file, which should look like
- <Start of the file>
- # If using service account
- service_account_name: "your_account@developer.gserviceaccount.com"
- service_account_private_key_path: "/path/to/your-project.p12"
- # Or
- service_account_json_private_key_path: "/path/to/your-project.json"
+- To get started:
+ - Create instances:
+ 1) To create a remote cuttlefish instance with the local built image.
+ Example:
+ $ acloud create --local_image /tmp/image_dir
+ 2) To create a local cuttlefish instance using the image which has been
+ built out in your workspace.
+ Example:
+ $ acloud create --local-instance --local-image
- # If using OAuth2 authentication flow
- client_id: <client id created in the project>
- client_secret: <client secret for the client id>
+ - Delete instances:
+ $ acloud delete
- # Optional
- ssh_private_key_path: "~/.ssh/acloud_rsa"
- ssh_public_key_path: "~/.ssh/acloud_rsa.pub"
- orientation: "portrait"
- resolution: "800x1280x32x213"
- network: "default"
- machine_type: "n1-standard-1"
- extra_data_disk_size_gb: 10 # 4G or 10G
+Try $acloud [cmd] --help for further details.
- # Required
- project: "your-project"
- zone: "us-central1-f"
- storage_bucket_name: "your_google_storage_bucket_name"
- <End of the file>
-
- Save it at /path/to/acloud.config
-
-- Example calls:
- - Create two instances:
- $ acloud.par create_cf
- --build_target aosp_cf_x86_phone-userdebug \
- --build_id 3744001 --num 2 --config_file /path/to/acloud.config \
- --report_file /tmp/acloud_report.json --log_file /tmp/acloud.log
-
- - Delete two instances:
- $ acloud.par delete --instance_names
- ins-b638cdba-3744001-gce-x86-phone-userdebug-fastbuild3c-linux
- --config_file /path/to/acloud.config
- --report_file /tmp/acloud_report.json --log_file /tmp/acloud.log
"""
import argparse
import getpass
@@ -119,12 +99,10 @@
CMD_CREATE_GOLDFISH,
delete_args.CMD_DELETE,
])
- usage_msg = ("acloud { %s } ..."
- "\nTry 'acloud --help' for more information.") % usage
parser = argparse.ArgumentParser(
description=__doc__,
formatter_class=argparse.RawDescriptionHelpFormatter,
- usage=usage_msg)
+ usage="acloud {" + usage + "} ...")
subparsers = parser.add_subparsers()
subparser_list = []