[telemetry] Use consistent bucket naming.

tools/telemetry/cloud_storage

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import logging
 import os
 import subprocess
 import sys
 
 from telemetry.core import command_line
 from telemetry.util import cloud_storage
 
 
-BUCKET_ALIASES = {
-    'public': cloud_storage.PUBLIC_BUCKET,
-    'partner': cloud_storage.PARTNER_BUCKET,
-    'google-only': cloud_storage.INTERNAL_BUCKET,
-}
 BUCKETS = {bucket: easy_bucket_name for easy_bucket_name, bucket
-           in BUCKET_ALIASES.iteritems()}
+           in cloud_storage.BUCKET_ALIASES.iteritems()}
 
 
 def _GetPaths(path):
   root, ext = os.path.splitext(path)
   if ext == '.sha1':
     file_path = root
     hash_path = path
   else:
     file_path = path
     hash_path = path + '.sha1'
@@ skipping 76 matching lines @@
       else:
         print '%-11s  %s' % ('not found', file_path)
 
 
 class Mv(command_line.Command):
   """Move files to the given bucket."""
 
   @classmethod
   def AddCommandLineArgs(cls, parser):
     parser.add_argument('files', nargs='+')
-    parser.add_argument('bucket', choices=BUCKET_ALIASES)
+    parser.add_argument('bucket', choices=cloud_storage.BUCKET_ALIASES)
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
-    args.bucket = BUCKET_ALIASES[args.bucket]
+    args.bucket = cloud_storage.BUCKET_ALIASES[args.bucket]
 
   def Run(self, args):
     files = _FindFilesInCloudStorage(args.files)
 
     for file_path, buckets in sorted(files.iteritems()):
       if not buckets:
         raise IOError('%s not found in Cloud Storage.' % file_path)
 
     for file_path, buckets in sorted(files.iteritems()):
       if args.bucket in buckets:
@@ skipping 25 matching lines @@
       for bucket in buckets:
         cloud_storage.Delete(bucket, file_hash)
 
 
 class Upload(command_line.Command):
   """Upload files to Cloud Storage."""
 
   @classmethod
   def AddCommandLineArgs(cls, parser):
     parser.add_argument('files', nargs='+')
-    parser.add_argument('bucket', choices=BUCKET_ALIASES)
+    parser.add_argument('bucket', choices=cloud_storage.BUCKET_ALIASES)
 
   @classmethod
   def ProcessCommandLineArgs(cls, parser, args):
-    args.bucket = BUCKET_ALIASES[args.bucket]
+    args.bucket = cloud_storage.BUCKET_ALIASES[args.bucket]
 
     for path in args.files:
       if not os.path.exists(path):
         parser.error('File not found: %s' % path)
 
   def Run(self, args):
     for file_path in args.files:
       file_hash = cloud_storage.CalculateHash(file_path)
 
       # Create or update the hash file.
       hash_path = file_path + '.sha1'
       with open(hash_path, 'wb') as f:
         f.write(file_hash)
         f.flush()
 
       # Add the data to Cloud Storage.
       cloud_storage.Insert(args.bucket, file_hash, file_path)
 
       # Add the hash file to the branch, for convenience. :)
       subprocess.call(['git', 'add', hash_path])
 
 
 class CloudStorageCommand(command_line.SubcommandCommand):
   commands = (Ls, Mv, Rm, Upload)
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.INFO)
   sys.exit(CloudStorageCommand.main())