fog-maestrodev 1.18.0.20131209091424 → 1.18.0.20131218202447

data/lib/fog/vcloud_director/generators/compute/org_vdc_network.rb

@@ -0,0 +1,91 @@
+module Fog
+  module Generators
+    module Compute
+      module VcloudDirector
+
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/OrgVdcNetworkType.html
+        class OrgVdcNetwork
+          attr_reader :options
+
+          def initialize(options={})
+            @options = options
+          end
+
+          def generate_xml
+
+            body = Nokogiri::XML::Builder.new do
+              attrs = {
+                :xmlns => 'http://www.vmware.com/vcloud/v1.5',
+                :name  => options[:name]
+              }
+              OrgVdcNetwork(attrs) {
+                Description options[:Description] if options.key?(:Description)
+                if configuration = options[:Configuration]
+                  Configuration {
+                    if ip_scopes = configuration[:IpScopes]
+                      IpScopes {
+                        if ip_scope = ip_scopes[:IpScope]
+                          IpScope {
+                            IsInherited  ip_scope[:IsInherited] if ip_scope.key?(:IsInherited)
+                            Gateway      ip_scope[:Gateway]     if ip_scope.key?(:Gateway)
+                            Netmask      ip_scope[:Netmask]     if ip_scope.key?(:Netmask)
+                            Dns1         ip_scope[:Dns1]        if ip_scope.key?(:Dns1)
+                            Dns2         ip_scope[:Dns2]        if ip_scope.key?(:Dns2)
+                            DnsSuffix    ip_scope[:DnsSuffix]   if ip_scope.key?(:DnsSuffix)
+                            IsEnabled    ip_scope[:IsEnabled]   if ip_scope.key?(:IsEnabled)
+                            if ip_ranges = ip_scope[:IpRanges]
+                              IpRanges {
+                                ip_ranges.each do |h|
+                                  if h.key?(:IpRange)
+                                    IpRange {
+                                      StartAddress h[:IpRange][:StartAddress]
+                                      EndAddress   h[:IpRange][:EndAddress]
+                                    }
+                                  end
+                                end
+                              }
+                            end
+                          }
+                        end
+                      }
+                    end
+                    FenceMode    configuration[:FenceMode]
+                    if router_info = configuration[:RouterInfo]
+                      RouterInfoType {
+                        ExternalIp router_info[:ExternalIp]
+                      }
+                    end
+                  }
+                end # Configuration
+
+                if edgegw = options[:EdgeGateway] and configuration[:FenceMode] != 'isolated'
+                  EdgeGateway(edgegw)
+                elsif options[:Configuration] && options[:Configuration][:FenceMode] == 'isolated'
+                  # isolated networks can specify ServiceConfig
+                  if sc = options[:ServiceConfig]
+                    ServiceConfig {
+                      if dhcp = sc[:GatewayDhcpService]
+                        IsEnabled dhcp[:IsEnabled] if dhcp[:IsEnabled]
+                        if pool = dhcp[:Pool]
+                          IsEnabled        pool[:IsEnabled]
+                          DefaultLeaseTime pool[:DefaultLeaseTime]
+                          MaxLeaseTime     pool[:MaxLeaseTime]
+                          LowIpAddress     pool[:LowIpAddress]
+                          HighIpAddress    pool[:HighIpAddress]
+                        end
+                      end
+                    }
+                  end
+                end
+
+                IsShared       options[:IsShared] if options.key?(:IsShared)
+
+              }
+            end.to_xml
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud_director/generators/compute/vapp.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Generators
+    module Compute
+      module VcloudDirector
+
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/types/VAppType.html
+        class Vapp
+          attr_reader :name, :options
+
+          def initialize(name, options={})
+            @name = name
+            @options = options
+          end
+
+          def generate_xml
+            attrs = @attrs
+            Nokogiri::XML::Builder.new do
+              VApp('xmlns' => 'http://www.vmware.com/vcloud/v1.5',
+                   'name' => name
+                  ) {
+                Description options[:Description] if options.key?(:Description)
+              }
+            end.to_xml
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud_director/models/compute/vm_customization.rb

@@ -14,6 +14,8 @@ module Fog
         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

data/lib/fog/vcloud_director/parsers/compute/vm_customization.rb

@@ -32,6 +32,8 @@ module Fog
               @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'

data/lib/fog/vcloud_director/requests/compute/delete_network.rb

@@ -0,0 +1,64 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+        # Delete an OrgVdcNetwork
+        #
+        # This operation is asynchronous and returns a task that you can
+        # monitor to track the progress of the request.
+        #
+        # @param [String] id Object identifier of the OrgVdcNetwork.
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #
+        # @raise [Fog::Compute::VcloudDirector::BadRequest]
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/DELETE-Network.html
+        # @since vCloud API version 0.9
+        def delete_network(id)
+          request(
+            :expects => 202,
+            :method  => 'DELETE',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "admin/network/#{id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_network(id)
+
+          unless data[:networks][id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              "No access to entity \"(com.vmware.vcloud.entity.orgVdcNetwork:#{id})\""
+            )
+          end
+
+          owner = {
+            :href => make_href("network/#{id}"),
+            :type => 'application/vnd.vmware.vcloud.network+xml'
+          }
+          task_id = enqueue_task(
+            "Deleting Network(#{id})", 'DeleteNetwork', owner,
+            :on_success => lambda do
+              data[:networks].delete(id)
+            end
+          )
+
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location,
+          }.merge(task_body(task_id))
+
+          Excon::Response.new(
+            :status => 202,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+
+      end
+    end
+  end
+end