fog 1.16.0 → 1.17.0

data/lib/fog/vcloud_director/generators/compute/{edge_gateway.rb → edge_gateway_service_configuration.rb}

@@ -2,7 +2,7 @@ module Fog
   module Generators
     module Compute
       module VcloudDirector
-        class EdgeGateway
+        class EdgeGatewayServiceConfiguration
           def initialize(configuration={})
             @configuration = configuration
           end
@@ -143,6 +143,7 @@ module Fog
                   xml.SourcePort rule[:SourcePort] == "Any" ? "-1" : rule[:SourcePort]
                   xml.SourcePortRange rule[:SourcePortRange]
                   xml.SourceIp rule[:SourceIp]
+                  xml.EnableLogging rule[:EnableLogging] if rule.key?(:EnableLogging)
                 }
 
               end

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

@@ -22,6 +22,39 @@ module Fog
           )
         end
       end
+
+      class Mock
+        def delete_disk(id)
+          unless data[:disks][id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              "No access to entity \"(com.vmware.vcloud.entity.disk:#{id})\""
+            )
+          end
+
+          owner = {
+            :href => make_href("disk/#{id}"),
+            :type => 'application/vnd.vmware.vcloud.disk+xml'
+          }
+          task_id = enqueue_task(
+            "Deleting Disk(#{id})", 'vdcDeleteDisk', owner,
+            :on_success => lambda do
+              data[:disks].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

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

@@ -10,6 +10,67 @@ module Fog
         # @param [String] id Object identifier of the media object.
         # @return [Excon::Response]
         #   * body<~Hash>:
+        #     * :href<~String> - The URI of the entity.
+        #     * :type<~String> - The MIME type of the entity.
+        #     * :id<~String> - The entity identifier, expressed in URN format.
+        #       The value of this attribute uniquely identifies the entity,
+        #       persists for the life of the entity, and is never reused.
+        #     * :operationKey<~String> - Optional unique identifier to support
+        #       idempotent semantics for create and delete operations.
+        #     * :name<~String> - The name of the entity.
+        #     * :cancelRequested<~String> - Whether user has requested this
+        #       processing to be canceled.
+        #     * :endTime<~String> - The date and time that processing of the
+        #       task was completed. May not be present if the task is still
+        #       being executed.
+        #     * :expiryTime<~String> - The date and time at which the task
+        #       resource will be destroyed and no longer available for
+        #       retrieval. May not be present if the task has not been executed
+        #       or is still being executed.
+        #     * :operation<~String> - A message describing the operation that
+        #       is tracked by this task.
+        #     * :operationName<~String> - The short name of the operation that
+        #       is tracked by this task.
+        #     * :serviceNamespace<~String> - Identifier of the service that
+        #       created the task.
+        #     * :startTime<~String> - The date and time the system started
+        #       executing the task. May not be present if the task has not been
+        #       executed yet.
+        #     * :status<~String> - The execution status of the task.
+        #     * :Link<~Array<Hash>>:
+        #     * :Description<~String> - Optional description.
+        #     * :Owner<~Hash> - Reference to the owner of the task. This is
+        #       typically the object that the task is creating or updating.
+        #     * :href<~String> - Contains the URI to the entity.
+        #     * :name<~String> - Contains the name of the entity.
+        #     * :type<~String> - Contains the type of the entity.
+        #     * :Error<~Hash> - Represents error information from a failed
+        #       task.
+        #       * :majorErrorCode<~String> - The class of the error. Matches
+        #         the HTTP status code.
+        #       * :message<~String> - An one line, human-readable message
+        #         describing the error that occurred.
+        #       * :minorErrorCode<~String> - Resource-specific error code.
+        #       * :stackTrace<~String> - The stack trace of the exception.
+        #       * :vendorSpecificErrorCode<~String> - A vendor- or
+        #         implementation-specific error code that can reference
+        #         specific modules or source lines for diagnostic purposes.
+        #       * :User<~Hash> - The user who started the task.
+        #         * :href<~String> - Contains the URI to the entity.
+        #         * :name<~String> - Contains the name of the entity.
+        #         * :type<~String> - Contains the type of the entity.
+        #       * :Organization<~Hash> - The organization to which the :User
+        #         belongs.
+        #         * :href<~String> - Contains the URI to the entity.
+        #         * :name<~String> - Contains the name of the entity.
+        #         * :type<~String> - Contains the type of the entity.
+        #       * :Progress<~String> - Read-only indicator of task progress as
+        #         an approximate percentage between 0 and 100. Not available
+        #         for all tasks.
+        #       * :Params
+        #       * :Details<~String> - Detailed message about the task. Also
+        #         contained by the :Owner entity when task status is
+        #         preRunning.
         #
         # @raise [Fog::Compute::VcloudDirector::Forbidden]
         #
@@ -33,8 +94,27 @@ module Fog
             )
           end
 
-          Fog::Mock.not_implemented
-          media.is_used_here # avoid warning from syntax checker
+          owner = {
+            :href => make_href("media/#{id}"),
+            :type => 'application/vnd.vmware.vcloud.media+xml'
+          }
+          task_id = enqueue_task(
+            "Deleting Media File(#{media[:file][:uuid]})", 'vdcDeleteMedia', owner,
+            :on_success => lambda do
+              data[:medias].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

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

@@ -7,17 +7,115 @@ module Fog
         # @param [String] id Object identifier of the disk.
         # @return [Excon::Response]
         #   * body<~Hash>:
+        #     * :href<~String> - The URI of the disk.
+        #     * :type<~String> - The MIME type of the disk.
+        #     * :id<~String> - The disk identifier, expressed in URN format.
+        #     * :name<~String> - The name of the disk.
+        #     * :status<~String> - Creation status of the disk.
+        #     * :busSubType<~String> - Disk bus sub type.
+        #     * :busType<~String> - Disk bus type.
+        #     * :size<~String> - Size of the disk.
+        #     * :Description<~String> - Optional description.
+        #     * :Tasks<~Hash> - A list of queued, running, or recently
+        #       completed tasks associated with this disk.
+        #     * :StorageProfile<~Hash> - Storage profile of the disk.
+        #     * :Owner<~Hash> - Disk owner.
+        #
+        # @raise [Fog::Compute::VcloudDirector::Forbidden]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/GET-Disk.html
         # @since vCloud API version 5.1
         def get_disk(id)
-          request(
+          response = request(
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
             :path       => "disk/#{id}"
           )
+          ensure_list! response.body, :Link
+          ensure_list! response.body, :Tasks, :Task
+          ensure_list! response.body, :Files, :File
+          response
+        end
+      end
+
+      class Mock
+        def get_disk(id)
+          unless data[:disks][id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              'No access to entity "com.vmware.vcloud.entity.disk:%s".' % id
+            )
+          end
+
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location
+          }.merge(disk_body(id))
+
+          Excon::Response.new(
+            :status => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{@version}"},
+            :body => body
+          )
+        end
+
+        private
+
+        def disk_body(id)
+          disk = data[:disks][id]
+          storage_class_id = disk[:vdc_storage_class]
+
+          body = {
+            :href => make_href("disk/#{id}"),
+            :type => 'application/vnd.vmware.vcloud.disk+xml',
+            :id => "urn:vcloud:disk:#{id}",
+            :name => disk[:name],
+            :status => disk[:status].to_s,
+            :busSubType => disk[:bus_sub_type],
+            :busType => disk[:bus_type],
+            :size => disk[:size].to_s,
+            :Link => [
+              {
+                :href => make_href("vdc/#{disk[:vdc_id]}"),
+                :rel => 'up',
+                :type => 'application/vnd.vmware.vcloud.vdc+xml'
+              }
+            ],
+            :Description => disk[:description],
+            :Tasks => {
+              # FIXME: there's only one for now
+              :Task => disk[:tasks].map {|task_id| task_body(task_id)}.first
+            },
+            :Files => {
+              :File => []
+            },
+            :StorageProfile => {
+              :href => make_href("vdcStorageProfile/#{storage_class_id}"),
+              :name => data[:vdc_storage_classes][storage_class_id][:name],
+              :type => 'application/vnd.vmware.vcloud.vdcStorageProfile+xml',
+            },
+            :Owner => {
+              :type => 'application/vnd.vmware.vcloud.owner+xml',
+              :User => {
+                :href => make_href("admin/user/#{user_uuid}"),
+                :name => user_name,
+                :type => 'application/vnd.vmware.admin.user+xml',
+              }
+            }
+          }
+
+          if api_version.to_f >= 5.1
+            storage_class_id = disk[:vdc_storage_class]
+            body[:VdcStorageProfile] = {
+              :href => make_href("vdcStorageProfile/#{storage_class_id}"),
+              :name => data[:vdc_storage_classes][storage_class_id][:name],
+              :type => 'application/vnd.vmware.vcloud.vdcStorageProfile+xml',
+            }
+          end
+
+          body
         end
       end
     end

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

@@ -7,6 +7,19 @@ module Fog
         # @param [String] id Object identifier of the disk.
         # @return [Excon::Response]
         #   * body<~Hash>:
+        #     * :href<~String> - The URI of the disk.
+        #     * :type<~String> - The MIME type of the disk.
+        #     * :Link<~Hash>:
+        #       * :href<~String> -
+        #       * :type<~String> -
+        #       * :rel<~String> -
+        #     * :User<~Hash> - Reference to the user who is the owner of this
+        #       disk.
+        #       * :href<~String> - The URI of the user.
+        #       * :name<~String> - The name of the user.
+        #       * :type<~String> - The MIME type of the user.
+        #
+        # @raise [Fog::Compute::VcloudDirector::Forbidden]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/GET-DiskOwner.html
         # @since vCloud API version 5.1
@@ -20,6 +33,38 @@ module Fog
           )
         end
       end
+
+      class Mock
+        def get_disk_owner(id)
+          unless data[:disks][id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              'No access to entity "com.vmware.vcloud.entity.disk:%s".' % id
+            )
+          end
+
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location,
+            :Link => {
+              :href => make_href("disk/#{id}"),
+              :type => 'application/vnd.vmware.vcloud.disk+xml',
+              :rel => 'up'
+            },
+            :User => {
+              :href => make_href("admin/user/#{user_uuid}"),
+              :name => user_name,
+              :type => 'application/vnd.vmware.admin.user+xml',
+            }
+          }
+
+          Excon::Response.new(
+            :status => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{@version}"},
+            :body => body
+          )
+        end
+      end
     end
   end
 end

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

@@ -13,13 +13,38 @@ module Fog
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/GET-EdgeGateway.html
         # @since vCloud API version 5.1
         def get_edge_gateway(id)
-          request(
-            :expects    => 200,
-            :idempotent => true,
-            :method     => 'GET',
-            :parser     => Fog::ToHashDocument.new,
-            :path       => "admin/edgeGateway/#{id}"
+          response = request(
+              :expects => 200,
+              :idempotent => true,
+              :method => 'GET',
+              :parser => Fog::ToHashDocument.new,
+              :path => "admin/edgeGateway/#{id}"
           )
+
+          edge_gateway_service_configuration = response.body[:Configuration][:EdgeGatewayServiceConfiguration]
+
+          ensure_list! edge_gateway_service_configuration[:FirewallService], :FirewallRule if edge_gateway_service_configuration[:FirewallService]
+          ensure_list! edge_gateway_service_configuration[:NatService], :NatRule if edge_gateway_service_configuration[:NatService]
+
+          if edge_gateway_service_configuration[:LoadBalancerService]
+
+            ensure_list! edge_gateway_service_configuration[:LoadBalancerService], :Pool
+            edge_gateway_service_configuration[:LoadBalancerService][:Pool].each do |pool|
+              ensure_list! pool, :ServicePort
+              ensure_list! pool, :Member
+              pool[:Member].each do |member|
+                ensure_list! member, :ServicePort
+              end
+            end
+
+            ensure_list! edge_gateway_service_configuration[:LoadBalancerService], :VirtualServer
+            edge_gateway_service_configuration[:LoadBalancerService][:VirtualServer].each do |virtual_server|
+              ensure_list! virtual_server, :ServiceProfile
+            end
+
+          end
+
+          response
         end
       end
 
@@ -32,7 +57,6 @@ module Fog
           end
 
           vdc_id = edge_gateway[:vdc]
-
           body = {
             :xmlns => xmlns,
             :xmlns_xsi => xmlns_xsi,
@@ -55,18 +79,8 @@ module Fog
                      {:rel => "edgeGateway:syncSyslogSettings",
                       :href => make_href("admin/edgeGateway/#{id}/action/syncSyslogServerSettings")}],
             :Description => "vCloud CI (nft00052i2)",
-            :Configuration =>
-             {:GatewayBackingConfig => "compact",
-              :GatewayInterfaces =>
-               {:GatewayInterface => []},
-              :EdgeGatewayServiceConfiguration =>
-               {:FirewallService =>
-                {:IsEnabled => "true",
-                 :DefaultAction => "drop",
-                 :LogDefaultAction => "false"},
-                :NatService => {:IsEnabled => "true"}},
-              :HaEnabled => "false",
-              :UseDefaultRouteForDnsRelay => "false"}}
+            :Configuration => edge_gateway[:Configuration].dup
+          }
 
           body[:Configuration][:GatewayInterfaces][:GatewayInterface] += edge_gateway[:networks].map do |network|
             extras = {

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

@@ -13,26 +13,97 @@ module Fog
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/GET-Media.html
         # @since vCloud API version 0.9
         def get_media(id)
-          request(
+          response = request(
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
             :path       => "media/#{id}"
           )
+          ensure_list! response.body, :Files, :File
+          response
         end
       end
 
       class Mock
         def get_media(id)
-          unless media = data[:medias][id]
+          unless data[:medias][id]
             raise Fog::Compute::VcloudDirector::Forbidden.new(
               "No access to entity \"(com.vmware.vcloud.entity.media:#{id})\"."
             )
           end
 
-          Fog::Mock.not_implemented
-          media.is_used_here # avoid warning from syntax checker
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location
+          }.merge(media_body(id))
+
+          Excon::Response.new(
+            :status => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=>#{@api_version}"},
+            :body => body
+          )
+        end
+
+        private
+
+        def media_body(id)
+          media = data[:medias][id]
+
+          body = {
+            :size => media[:size].to_s,
+            :imageType => media[:image_type],
+            :status => media[:status].to_s,
+            :name => media[:name],
+            :id => "urn:vcloud:media:#{id}",
+            :type => 'application/vnd.vmware.vcloud.media+xml',
+            :href => make_href("media/#{id}"),
+            :Link => {
+              :href => make_href("vdc/#{media[:vdc_id]}"),
+              :type => 'application/vnd.vmware.vcloud.vdc+xml',
+              :rel => 'up'
+            },
+            :Description => media[:description] || '',
+            :Tasks => {
+              # FIXME: there's only one for now
+              :Task => media[:tasks].map {|task_id| task_body(task_id)}.first
+            },
+            :Files => {
+              :File => []
+            },
+            :Owner => {
+              :type => 'application/vnd.vmware.vcloud.owner+xml',
+              :User => {
+                :href => make_href("admin/user/#{user_uuid}"),
+                :name => user_uuid,
+                :type => 'application/vnd.vmware.admin.user+xml',
+              }
+            }
+          }
+
+          if media[:status] == 0
+            body[:Files][:File] << {
+              :size => media[:size].to_s,
+              :bytesTransferred => media[:file][:bytes_transferred].to_s,
+              :name => 'file',
+              :Link=> {
+                :href => make_href("transfer/#{media[:file][:uuid]}/file"),
+                :rel => 'upload:default'
+              }
+            }
+          end
+
+          if api_version.to_f >= 5.1
+            storage_class_id = media[:vdc_storage_class]
+            body[:VdcStorageProfile] = {
+              :href => make_href("vdcStorageProfile/#{storage_class_id}"),
+              :name => data[:vdc_storage_classes][storage_class_id][:name],
+              :type => 'application/vnd.vmware.vcloud.vdcStorageProfile+xml',
+            }
+          end
+
+          body
         end
       end
     end