[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at v0.0.3-217-gc63c087

[Adrian Likins]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  c63c08700269cb643e8a363ecb71cb9f89a1397f (commit)
       via  0990b2e0a079b12eddcff617386f7bb11931e006 (commit)
      from  c0b0153fec7323973356f10d9b64cea30cba5c5e (commit)

- Log -----------------------------------------------------------------
commit c63c08700269cb643e8a363ecb71cb9f89a1397f
Merge: 0990b2e... c0b0153...
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Fri Aug 24 16:08:44 2007 -0400

    Merge branch 'master' of git+ssh://g-alikins@et.redhat.com/git/virt-factory

commit 0990b2e0a079b12eddcff617386f7bb11931e006
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Fri Aug 24 16:08:33 2007 -0400

    list.py:
    	fix s/machines/hosts stuff and s/deployments/guests
    
    query.py:
    	fix a bug where we weren't showing the right profile info
    	(kept showing last one from list)
-----------------------------------------------------------------------

Diffstat:
 ampm/command_modules/list.py  |    8 ++++----
 ampm/command_modules/query.py |   10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ampm/command_modules/list.py b/ampm/command_modules/list.py
index d64eb70..2f340a1 100644
--- a/ampm/command_modules/list.py
+++ b/ampm/command_modules/list.py
@@ -55,11 +55,11 @@ class List(object):
             # raise error?
             print "incorrect mode"
 
-        if mode == "machines":
+        if mode == "hosts":
             self.list_machines()
 
-        if mode == "deployments":
-            self.list_deployments()
+        if mode == "guests":
+            self.list_guests()
 
         if mode == "status":
             self.list_status()
@@ -82,7 +82,7 @@ class List(object):
                 continue
             print "hostname: %s id: %s profile_name: %s" % (machine['id'], machine['hostname'], machine['profile']['name'])
 
-    def list_deployments(self):
+    def list_guests(self):
         (retcode, data) = self.api.deployment_list()
         if self.verbose > 2:
             pprint.pprint(data)
diff --git a/ampm/command_modules/query.py b/ampm/command_modules/query.py
index 40a5ff6..763d5bf 100644
--- a/ampm/command_modules/query.py
+++ b/ampm/command_modules/query.py
@@ -79,9 +79,11 @@ class Query(object):
                 continue
             if profile['name'] == profile_name:
                 profile_id = profile['id']
-        
+
         (retcode, data)  = self.api.profile_get(id=profile_id)
-        print "%s %s %s %s %s %s %s" % (profile['name'], profile['version'],
-                                        profile['distribution']['name'], profile['virt_storage_size'],
-                                        profile['virt_ram'],  profile['valid_targets'], profile['puppet_classes'])
+        ret_profile = data['data']
+        print "%s %s %s %s %s %s %s" % (ret_profile['name'], ret_profile['version'],
+                                        ret_profile['distribution']['name'], ret_profile['virt_storage_size'],
+                                        ret_profile['virt_ram'],  ret_profile['valid_targets'],
+                                        ret_profile['puppet_classes'])
         

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  c0b0153fec7323973356f10d9b64cea30cba5c5e \
  c63c08700269cb643e8a363ecb71cb9f89a1397f