fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/ecloud/requests/compute/virtual_machine_edit_hardware_configuration.rb

@@ -21,8 +21,8 @@ module Fog
           xml.HardwareConfiguration do
             xml.ProcessorCount data[:cpus]
             xml.Memory do
-              xml.Unit data[:memory][:Unit]
-              xml.Value data[:memory][:Value]
+              xml.Unit "MB"
+              xml.Value data[:memory]
             end
             xml.Disks do
               data[:disks].each do |disk|
@@ -45,7 +45,31 @@ module Fog
                 end
               end
             end
-          end    
+          end
+        end
+      end
+
+      class Mock
+        def virtual_machine_edit_hardware_configuration(vm_uri, data)
+
+          server_id = vm_uri.match(/(\d+)/)[1]
+
+          server  = self.data[:servers][server_id.to_i]
+          task_id = Fog::Mock.random_numbers(10)
+          task = {
+            :id            => task_id,
+            :href          => "/cloudapi/ecloud/tasks/#{task_id}",
+            :type          => "application/vnd.tmrk.cloud.task",
+            :Operation     => "Configure Server",
+            :Status        => "Complete",
+            :ImpactedItem  => Fog::Ecloud.keep(server, :name, :href, :type),
+            :StartTime     => Time.now.iso8601,
+            :CompletedTime => Time.now.iso8601,
+            :InitiatedBy   => {},
+          }
+          self.data[:tasks][task_id] = task
+
+          response(:body =>  task)
         end
       end
     end

data/lib/fog/ecloud/requests/compute/virtual_machine_import.rb

@@ -9,7 +9,7 @@ module Fog
             raise ArgumentError.new("Required data missing: #{(required_opts - options.keys).map(&:inspect).join(", ")}")
           end
 
-          options[:network_uri] = options[:network_uri].is_a?(String) ? [options[:network_uri]] : options[:network_uri]
+          options[:network_uri] = [*options[:network_uri]]
           options[:template_uri] = template_uri
           options
         end
@@ -54,14 +54,128 @@ module Fog
 
           request(
             :expects => 201,
-            :method => 'POST',
-            :headers => {},
-            :body => build_request_body_import(options),
-            :uri => options[:uri],
-            :parse => true
+            :method  => 'POST',
+            :body    => build_request_body_import(options),
+            :uri     => options[:uri],
+            :parse   => true
           )
         end
       end
+
+      class Mock
+        def virtual_machine_import(template_uri, options)
+          options         = validate_import_server_options(template_uri, options)
+
+          compute_pool_id = options[:uri].match(/computePools\/(\d+)/)[1].to_i
+          compute_pool    = self.data[:compute_pools][compute_pool_id].dup
+          environment     = self.data[:environments][compute_pool[:environment_id]]
+          networks        = options[:network_uri].map{|nuri| self.data[:networks][id_from_uri(nuri)].dup}
+          server_id       = Fog::Mock.random_numbers(6).to_i
+          row_id          = Fog::Mock.random_numbers(6).to_i
+          group_id        = Fog::Mock.random_numbers(6).to_i
+          nics            = networks.each_with_index.map do |network, i|
+            {
+              :UnitNumber => i.to_s,
+              :Name       => "Network adapter #{i}",
+              :MacAddress => Fog::Ecloud.mac_address,
+              :Network    => Fog::Ecloud.keep(network, :name, :href, :type)
+            }
+          end
+
+          links = [Fog::Ecloud.keep(compute_pool, :name, :href, :type), Fog::Ecloud.keep(environment, :name, :href, :type)]
+          networks.each{|network| links << Fog::Ecloud.keep(network, :name, :href, :type)}
+          server = {
+            :href        => "/cloudapi/ecloud/virtualmachines/#{server_id}",
+            :name        => options[:name],
+            :type        => "application/vnd.tmrk.cloud.virtualMachine",
+            :Description => options[:description],
+            :Status      => "Deployed",
+            :PoweredOn   => "false",
+            :HardwareConfiguration => {
+              :href => "/cloudapi/ecloud/virtualmachines/#{server_id}/hardwareconfiguration",
+              :type => "application/vnd.tmrk.cloud.virtualMachineHardware",
+              :Links => {
+                :Link => {
+                  :href => "/cloudapi/ecloud/virtualmachines/#{server_id}",
+                  :name => options[:name],
+                  :type => "application/vnd.tmrk.cloud.virtualMachine",
+                  :rel  => "up"
+                }
+              },
+              :ProcessorCount => options[:cpus],
+              :Memory => {
+                :Unit  => "MB",
+                :Value => options[:memory],
+              },
+              :Disks => { # Default drive
+                :Disk => [{
+                  :Index => "0",
+                  :Name  => "Hard Disk 1",
+                  :Size  => {
+                    :Unit  => "GB",
+                    :Value => "25"
+                  },
+                }],
+              },
+              :Nics => {
+                :Nic => nics,
+              },
+            },
+            :Links => { :Link => links },
+          }
+
+          row = {
+            :id => row_id,
+            :name => options[:row],
+            :href => "/cloudapi/ecloud/layoutrows/#{row_id}",
+            :type => "application/vnd.tmrk.cloud.layoutRow",
+            :Links => {
+              :Link => [
+                Fog::Ecloud.keep(environment, :name, :href, :type)
+              ],
+            },
+            :Index => 0,
+            :Groups => {
+              :Group => [
+              ],
+            },
+            :environment_id => environment[:id],
+          }
+
+          group = {
+            :id => group_id,
+            :name => options[:group],
+            :href => "/cloudapi/ecloud/layoutgroups/#{group_id}",
+            :type => "application/vnd.tmrk.cloud.layoutGroup",
+            :Links => {
+              :Link => [
+                Fog::Ecloud.keep(row, :name, :href, :type),
+              ],
+            },
+            :Index => 0,
+            :VirtualMachines => {
+              :VirtualMachine => [
+                server,
+              ],
+            },
+            :row_id => row_id,
+          }
+          row[:Groups][:Group].push(group)
+          layout[:Rows][:Row].push(row)
+
+          server.merge!(:OperatingSystem => options[:operating_system].merge(:type => "application/vnd.tmrk.cloud.operatingSystem")) if options[:operating_system]
+
+          server_response = response(:body =>  server)
+
+          server.merge!(:compute_pool_id => compute_pool_id)
+
+          self.data[:servers][server_id] = server
+          self.data[:rows][row_id]       = row
+          self.data[:groups][group_id]   = group
+
+          server_response
+        end
+      end
     end
   end
 end

data/lib/fog/glesys/models/compute/ip.rb

@@ -15,12 +15,12 @@ module Fog
         attribute :ip
 
         def list_own
-          connection.list_own
+          service.list_own
         end
 
         def list_free
           requires :version, :datacenter, :platform
-          connection.ip_list_free(
+          service.ip_list_free(
             :ipversion => version,
             :platform => platform,
             :datacenter => datacenter
@@ -29,7 +29,7 @@ module Fog
 
         def details
           requires :version, :ip
-          connection.ip_details(
+          service.ip_details(
             :ipversion => version,
             :ipaddress => ip
           )
@@ -37,7 +37,7 @@ module Fog
 
         def take
           requires :version, :ip
-          connection.ip_take(
+          service.ip_take(
             :ipversion => version,
             :ipaddress => ip
           )
@@ -45,7 +45,7 @@ module Fog
 
         def release
           requires :version, :ip
-          connection.ip_release(
+          service.ip_release(
             :ipversion => version,
             :ipaddress => ip
           )
@@ -53,7 +53,7 @@ module Fog
 
         def add
           requires :serverid, :version, :ip
-          connection.ip_add(
+          service.ip_add(
             :serverid  => serverid,
             :ipversion => version,
             :ipaddress => ip
@@ -62,7 +62,7 @@ module Fog
 
         def remove
           requires :serverid, :version, :ip
-          connection.ip_remove(
+          service.ip_remove(
             :serverid  => serverid,
             :ipversion => version,
             :ipaddress => ip

data/lib/fog/glesys/models/compute/ips.rb

@@ -12,22 +12,22 @@ module Fog
         attribute :serverid
 
         def all
-          data = connection.ip_list_own.body['response']['iplist']
+          data = service.ip_list_own.body['response']['iplist']
           load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
-          
-          self.new( :serverid => identifier )          
 
-          data  = connection.ip_list_own(:serverid => identifier).body['response']
+          self.new( :serverid => identifier )
+
+          data  = service.ip_list_own(:serverid => identifier).body['response']
           if data['iplist'].empty?
-            nil 
+            nil
           else
             new(data['iplist'].first)
-          end 
-        end 
+          end
+        end
 
         def new(attributes = {})
           super({ :serverid => serverid }.merge!(attributes))

data/lib/fog/glesys/models/compute/server.rb

@@ -32,22 +32,22 @@ module Fog
 
         def start
           requires :identity
-          connection.start(:serverid => identity)
+          service.start(:serverid => identity)
         end
 
         def stop
           requires :identity
-          connection.stop(:serverid => identity)
+          service.stop(:serverid => identity)
         end
 
         def reboot
           requires :identity
-          connection.reboot(:serverid => identity)
+          service.reboot(:serverid => identity)
         end
 
         def destroy
           requires :identity
-          connection.destroy(:serverid => identity, :keepip => keepip)
+          service.destroy(:serverid => identity, :keepip => keepip)
         end
 
         def save
@@ -64,8 +64,8 @@ module Fog
             :cpucores       => cpucores     || "1",
             :rootpassword   => rootpassword,
             :transfer       => transfer     || "500",
-          } 
-          data = connection.create(options)
+          }
+          data = service.create(options)
           merge_attributes(data.body['response']['server'])
           data.status == 200 ? true : false
         end

data/lib/fog/glesys/models/compute/servers.rb

@@ -10,16 +10,16 @@ module Fog
         model Fog::Compute::Glesys::Server
 
         def all
-          data = connection.list_servers.body['response']['servers']
-          load(data) 
+          data = service.list_servers.body['response']['servers']
+          load(data)
         end
 
         def get(identifier)
           return nil if identifier.nil? || identifier == ""
 
           begin
-            details = connection.server_details(identifier).body['response']
-            status  = connection.server_status(identifier).body['response']
+            details = service.server_details(identifier).body['response']
+            status  = service.server_status(identifier).body['response']
 
             if details.empty? || status.empty?
               nil

data/lib/fog/glesys/models/compute/template.rb

@@ -16,7 +16,7 @@ module Fog
         attribute :min_disk_size
 
         def list
-          connection.template_list
+          service.template_list
         end
 
       end

data/lib/fog/glesys/models/compute/templates.rb

@@ -10,8 +10,8 @@ module Fog
         model Fog::Glesys::Compute::Template
 
         def all
-          openvz = connection.template_list.body['response']['templates']['OpenVZ']
-          xen    = connection.template_list.body['response']['templates']['Xen']
+          openvz = service.template_list.body['response']['templates']['OpenVZ']
+          xen    = service.template_list.body['response']['templates']['Xen']
 
           load(xen+openvz)
         end

data/lib/fog/go_grid/models/compute/image.rb

@@ -36,7 +36,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.grid_server_delete(id)
+          service.grid_server_delete(id)
           true
         end
 
@@ -45,10 +45,10 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :server_id
 
-          data = connection.grid_server_add(server_id, 'name' => name)
+          data = service.grid_server_add(server_id, 'name' => name)
           merge_attributes(data.body['image'])
           true
         end

data/lib/fog/go_grid/models/compute/images.rb

@@ -12,7 +12,7 @@ module Fog
         attribute :server
 
         def all
-          data = connection.grid_image_list.body['list']
+          data = service.grid_image_list.body['list']
           load(data)
           if server
             self.replace(self.select {|image| image.server_id == server.id})
@@ -20,7 +20,7 @@ module Fog
         end
 
         def get(image_id)
-          response = connection.grid_image_get.body['list'][image_id]
+          response = service.grid_image_get.body['list'][image_id]
           new(data)
         rescue Fog::Compute::GoGrid::NotFound
           nil

data/lib/fog/go_grid/models/compute/password.rb

@@ -10,7 +10,7 @@ module Fog
 
         attribute :server_id
         attribute :applicationtype
-        attribute :username	
+        attribute :username
         attribute :password_id,	:aliases => 'id'
         attribute :password
         attribute :server
@@ -21,13 +21,13 @@ module Fog
 
         def destroy
           requires :id
-          connection.grid_server_destroy(id)
+          service.grid_server_destroy(id)
           true
         end
 
         def image
           requires :image_id
-          connection.grid_image_get(image_id)
+          service.grid_image_get(image_id)
         end
 
         def ready?
@@ -35,9 +35,9 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :password_id
-          data = connection.support_password_list()
+          data = service.support_password_list()
           merge_attributes(data.body)
           true
         end

data/lib/fog/go_grid/models/compute/passwords.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::GoGrid::Password
 
         def all
-          data = connection.support_password_list.body['list']
+          data = service.support_password_list.body['list']
           load(data)
         end
 
@@ -21,8 +21,8 @@ module Fog
         end
 
         def get(id)
-          #if server_id && server = connection.grid_server_get(server_id).body['list']
-          if id && server = connection.support_password_get(id).body['list']
+          #if server_id && server = service.grid_server_get(server_id).body['list']
+          if id && server = service.support_password_get(id).body['list']
             new(server)
           end
         rescue Fog::Compute::GoGrid::NotFound