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

[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  1b808d5398fba5c601dcecc95330345c1c586966 (commit)
       via  1228409f19b44fe046ea3e3c063463d36e9cd5bd (commit)
      from  e181cd1ca5014808d8b06c6d5e648d2d0d61f5d8 (commit)

- Log -----------------------------------------------------------------
commit 1b808d5398fba5c601dcecc95330345c1c586966
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Wed Aug 29 14:46:20 2007 -0400

    make the system deploy test use ampm instead of poking at the wui

commit 1228409f19b44fe046ea3e3c063463d36e9cd5bd
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Wed Aug 29 14:45:18 2007 -0400

    handle bad args
-----------------------------------------------------------------------

Diffstat:
 ampm/command_modules/list.py |    5 +++++
 build/test-it-all.sh         |   26 +++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/ampm/command_modules/list.py b/ampm/command_modules/list.py
index d750d18..413e49e 100644
--- a/ampm/command_modules/list.py
+++ b/ampm/command_modules/list.py
@@ -39,10 +39,15 @@ class List(command_class.Command):
             if opt in ["-v", "--verbose"]:
                 self.verbose = self.verbose + 1
 
+        if not args:
+            self.print_help()
+            return
+        
         try:
             mode = args[0]
         except IndexError:
             raise
+        
 
         if mode not in ["hosts", "guests", "status", "profiles", "tasks", "users"]:
             # raise error?
diff --git a/build/test-it-all.sh b/build/test-it-all.sh
index da0697a..dd448fe 100755
--- a/build/test-it-all.sh
+++ b/build/test-it-all.sh
@@ -85,6 +85,9 @@ TEST_PROFILE_DEPLOY=Y
 # where to deploy?
 DEPLOY_HOST=mdehaan.rdu.redhat.com
 
+# which profile to deploy in the test deploy
+TEST_PROFILE="Test1::F7-x86_64"
+
 # whether to attempt to slay and undefine the first virtual
 # machine prior to starting testing, otherwise, testing
 # a deployment will fail.
@@ -133,6 +136,7 @@ show_config()
     echo "TEST_WEB_STUFF=$TEST_WEB_STUFF"
     echo "TEST_NODECOMM=$TEST_NODECOMM"
     echo "TEST_PROFILE_DEPLOY=$TEST_PROFILE_DEPLOY"
+    echo "TEST_PROFILE=$TEST_PROFILE"
     echo "TEST_AMPM=$TEST_AMPM"
     echo "DEPLOY_DESTROY=$DEPLOY_DESTROY"
     echo "ARCH=$ARCH"
@@ -299,6 +303,8 @@ start_services()
     
     # we need to restart httpd after installing mongrel
     /etc/init.d/httpd restart
+
+    /etc/init.d/libvirtd restart
 }
 
 start_client_services()
@@ -342,7 +348,7 @@ test_web_stuff()
 }
 
 
-deploy_a_system()
+deploy_a_system_web()
 {
 
     # FIXME: this is a bit hardcode at
@@ -354,6 +360,15 @@ deploy_a_system()
 
 }
 
+# use ampm to do the test deploy, since it's easier than trying to talk to the wui,
+# which is the whole point of ampm, afterall
+deploy_a_system()
+{
+    msg "Deploying a $TEST_PROFILE on DEPLOY_HOST"
+    /usr/bin/ampm create --host $DEPLOY_HOST --profile "$TEST_PROFILE"
+
+}
+
 test_nodecomm()
 {
     msg "Testing vf_nodecomm to see if basic node stuff is working"
@@ -587,10 +602,6 @@ if [ "$TEST_NODECOMM" == "Y" ] ; then
     test_nodecomm
 fi
 
-if [ "$TEST_PROFILE_DEPLOY" == "Y" ] ; then
-    msg "Running a virtual system deployment"
-    deploy_a_system
-fi
 
 
 if [ "$TEST_AMPM" == "Y" ] ; then
@@ -598,3 +609,8 @@ if [ "$TEST_AMPM" == "Y" ] ; then
     test_ampm
 fi
 
+if [ "$TEST_PROFILE_DEPLOY" == "Y" ] ; then
+    msg "Running a virtual system deployment"
+    deploy_a_system
+fi
+

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  e181cd1ca5014808d8b06c6d5e648d2d0d61f5d8 \
  1b808d5398fba5c601dcecc95330345c1c586966