Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

cli/job.py

 #
 # Copyright 2008 Google Inc. All Rights Reserved.
 
 """
 The job module contains the objects and methods used to
 manage jobs in Autotest.
 
 The valid actions are:
 list:    lists job(s)
 create:  create a job
@@ skipping 584 matching lines @@
 
     def execute(self):
         clone_info = self.execute_rpc(op='get_info_for_clone',
                                       id=self.clone_id,
                                       preserve_metahosts=self.reuse_hosts)
 
         # Remove fields from clone data that cannot be reused
         for field in ('name', 'created_on', 'id', 'owner'):
             del clone_info['job'][field]
 
-        # Also remove parameterized_job field, as the feature still is
-        # incomplete, this tool does not attempt to support it for now,
-        # it uses a different API function and it breaks create_job()
-        if clone_info['job'].has_key('parameterized_job'):
-            del clone_info['job']['parameterized_job']
-
         # Keyword args cannot be unicode strings
         self.data.update((str(key), val)
                          for key, val in clone_info['job'].iteritems())
 
         if self.reuse_hosts:
             # Convert host list from clone info that can be used for job_create
             for label, qty in clone_info['meta_host_counts'].iteritems():
                 self.data['meta_hosts'].extend([label]*qty)
 
             self.data['hosts'].extend(host['hostname']
@@ skipping 15 matching lines @@
 
 
     def execute(self):
         data = {'job__id__in': self.jobids}
         self.execute_rpc(op='abort_host_queue_entries', **data)
         print 'Aborting jobs: %s' % ', '.join(self.jobids)
 
 
     def get_items(self):
         return self.jobids