Merge pull request fog#2464 from astratto/guest_password

[vcloud_director] Fix Guest admin password settings
TranscendComputing · Dec 16, 2013 · 4c9bcab · 4c9bcab
2 parents 46b849e + 18ef1ec
commit 4c9bcab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/lib/fog/vcloud_director/README.md b/lib/fog/vcloud_director/README.md
@@ -386,6 +386,8 @@ vm.customization
     change_sid=false,
     join_domain_enabled=false,
     use_org_settings=false,
+    admin_password_auto=false,
+    admin_password='',
     admin_password_enabled=false,
     reset_password_required=false,
     virtual_machine_id="2ddeea36-ac71-470f-abc5-c6e3c2aca192",

diff --git a/lib/fog/vcloud_director/models/compute/vm_customization.rb b/lib/fog/vcloud_director/models/compute/vm_customization.rb
@@ -14,6 +14,8 @@ class VmCustomization < Model
         attribute :change_sid
         attribute :join_domain_enabled
         attribute :use_org_settings
+        attribute :admin_password_auto
+        attribute :admin_password
         attribute :admin_password_enabled
         attribute :reset_password_required
         attribute :virtual_machine_id

diff --git a/lib/fog/vcloud_director/parsers/compute/vm_customization.rb b/lib/fog/vcloud_director/parsers/compute/vm_customization.rb
@@ -32,6 +32,8 @@ def end_element(name)
               @response[:join_domain_enabled] = (value == "true")
             when 'UseOrgSettings'
               @response[:use_org_settings] = (value == "true")
+            when 'AdminPassword'
+              @response[:admin_password] = value
             when 'AdminPasswordEnabled'
               @response[:admin_password_enabled] = (value == "true")
             when 'AdminPasswordAuto'

diff --git a/lib/fog/vcloud_director/requests/compute/put_guest_customization_section_vapp.rb b/lib/fog/vcloud_director/requests/compute/put_guest_customization_section_vapp.rb
@@ -62,6 +62,7 @@ def put_guest_customization_section_vapp(id, options={})
             :change_sid => :ChangeSid,
             :join_domain_enabled => :JoinDomainEnabled,
             :use_org_settings => :UseOrgSettings,
+            :admin_password => :AdminPassword,
             :admin_password_enabled => :AdminPasswordEnabled,
             :admin_password_auto => :AdminPasswordAuto,
             :reset_password_required => :ResetPasswordRequired,