[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at 902660bd57dbfd76734bd19434173b19641b5cec

[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  902660bd57dbfd76734bd19434173b19641b5cec (commit)
       via  b8765ca11f233e45f14ee1e7ac4249557b9b32ab (commit)
       via  afb46e56ce952efea85a770b53c54671db6d76d5 (commit)
      from  ad50c13f88112c3d1b068d52d5e341480ebf3159 (commit)

- Log -----------------------------------------------------------------
commit 902660bd57dbfd76734bd19434173b19641b5cec
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Thu Jun 21 15:30:20 2007 -0400

    state and display dont need to be verified yet

commit b8765ca11f233e45f14ee1e7ac4249557b9b32ab
Merge: afb46e5... ad50c13...
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Thu Jun 21 13:14:46 2007 -0400

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

commit afb46e56ce952efea85a770b53c54671db6d76d5
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Thu Jun 21 13:14:32 2007 -0400

    default to testing a node deployment
    
    also, define $COOKIES_FILE so the web site testing actually does
    something useful
-----------------------------------------------------------------------

Diffstat:
 build/test-it-all.sh          |    3 ++-
 service/modules/deployment.py |   14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build/test-it-all.sh b/build/test-it-all.sh
index 9976d45..30161fd 100755
--- a/build/test-it-all.sh
+++ b/build/test-it-all.sh
@@ -78,7 +78,7 @@ TEST_WEB_STUFF=Y
 TEST_NODECOMM=Y
 
 # do we try doing an actual deployment
-TEST_PROFILE_DEPLOY=N
+TEST_PROFILE_DEPLOY=Y
 
 
 # you can put conf stuff in test-it-all.conf 
@@ -92,6 +92,7 @@ fi
 # since we can change VF_SERVER in the config, expand this after that
 VF_SERVER_URL="$VF_SERVER:5150"
 
+COOKIES_FILE="cookies"
 
 show_config()
 {
diff --git a/service/modules/deployment.py b/service/modules/deployment.py
index 467910c..94f0140 100755
--- a/service/modules/deployment.py
+++ b/service/modules/deployment.py
@@ -114,10 +114,14 @@ class Deployment(web_svc.AuthWebSvc):
         """
         mac = None
         profilename = None
-        required = ('machine_id', 'profile_id', 'state', 'display_name')
-        optional =\
-            ('hostname', 'ip_address', 'registration_token', 'mac_address', 'netboot_enabled', 
-             'puppet_node_diff', 'is_locked')
+        required = ('machine_id', 'profile_id')
+        optional = ('hostname',
+                    'ip_address',
+                    'registration_token',
+                    'mac_address',
+                    'netboot_enabled', 
+                    'puppet_node_diff',
+                    'is_locked')
         validator = FieldValidator(args)
         validator.verify_required(required)
         validator.verify_printable('puppet_node_diff')
@@ -199,7 +203,7 @@ class Deployment(web_svc.AuthWebSvc):
         mac = None
         profilename = None
         required = ('id',)
-        optional =\
+        optional =
             ('machine_id', 'state', 'display_name', 'hostname', 'ip_address', 'registration_token',
              'mac_address', 'netboot_enabled', 'puppet_node_diff', 'is_locked')
         filter = ('id', 'profile_id')

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  ad50c13f88112c3d1b068d52d5e341480ebf3159 \
  902660bd57dbfd76734bd19434173b19641b5cec