fog 1.4.0 → 1.5.0

data/lib/fog/cloudstack/models/compute/volume.rb

@@ -86,16 +86,14 @@ module Fog
           end
 
           options = {
-            'id' => id,
+            'id'               => id,
             'virtualmachineid' => instance_id,
           }
           options.merge!('deviceid' => mountpoint) if mountpoint
 
           data = connection.attach_volume(options)
 
-          Job.new(data["attachvolumeresponse"]).tap do |job|
-            job.connection= self.connection
-          end
+					connection.jobs.new(data["attachvolumeresponse"])
         end
 
         def detach
@@ -103,9 +101,7 @@ module Fog
 
           data = connection.detach_volume('id' => id)
 
-          Job.new(data["detachvolumeresponse"]).tap do |job|
-            job.connection= self.connection
-          end
+          connection.jobs.new(data["detachvolumeresponse"])
         end
 
         def destroy

data/lib/fog/cloudstack/models/compute/zone.rb

@@ -26,12 +26,11 @@ module Fog
             'domainid'              => domain_id,
             'guestcidraddress'      => guest_cidr_address,
             'internaldns2'          => internaldns2,
-            'securitygroupenabled'  => security_group_enabled,
+            'securitygroupenabled'  => security_groups_enabled,
           }
           data = connection.create_zone(options)
           merge_attributes(data['createzoneresponse'])
         end
-
       end # Zone
     end # Cloudstack
   end # Compute

data/lib/fog/cloudstack/requests/compute/assign_virtual_machine.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+        def assign_virtual_machine(options={})
+          options.merge!('command' => 'assignVirtualMachine')
+
+          request(options)
+        end
+      end
+      class Mock
+        # Fog::Compute::Cloudstack::Error: Failed to move vm VM is Running, unable to move the vm VM[User|e845934a-e44f-43da-aabf-05c90c651756]
+        #def assign_virtual_machine(options={})
+        #end
+      end
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/authorize_security_group_egress.rb

@@ -0,0 +1,68 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+        def authorize_security_group_egress(options={})
+          options.merge!(
+            'command' => 'authorizeSecurityGroupEgress'
+          )
+
+          request(options)
+        end
+      end # Real
+      class Mock
+        def authorize_security_group_egress(options={})
+          security_group_id      = options['securitygroupid']
+          security_group_rule_id = Fog::Cloudstack.uuid
+
+          unless cidr = options['cidrlist']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command missing parameter cidr')
+          end
+
+          unless start_port = options['startport']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command missing parameter start_port')
+          end
+
+          unless end_port = options['endport']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command missing parameter end_port')
+          end
+
+          unless protocol = options['protocol']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command missing parameter protocol')
+          end
+
+          rule = {
+            "ruleid"    => security_group_rule_id,
+            "cidr"      => cidr,
+            "startport" => start_port,
+            "endport"   => end_port,
+            "protocol"  => protocol
+          }
+
+          unless security_group = self.data[:security_groups][security_group_id]
+            raise Fog::Compute::Cloudstack::BadRequest.new("Security group id #{security_group_id} does not exist")
+          end
+
+          security_group["egressrule"] ||= []
+          security_group["egressrule"] << rule
+
+          job_id = Fog::Cloudstack.uuid
+          job = {
+            "cmd"           => "com.cloud.api.commands.authorizeSecurityGroupEgress",
+            "created"       => Time.now.iso8601,
+            "jobid"         => job_id,
+            "jobstatus"     => 1,
+            "jobprocstatus" => 0,
+            "jobresultcode" => 0,
+            "jobresulttype" => "object",
+            "jobresult"     => { "securitygroup" => security_group }
+          }
+
+          self.data[:jobs][job_id]= job
+
+          { "authorizesecuritygroupegressresponse" => { "jobid" => job_id } }
+        end
+      end # Mock
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/authorize_security_group_ingress.rb

@@ -3,9 +3,6 @@ module Fog
     class Cloudstack
       class Real
 
-        # Creates an account.
-        #
-        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/authorizeSecurityGroupIngress.html]
         def authorize_security_group_ingress(options={})
           options.merge!(
             'command' => 'authorizeSecurityGroupIngress'
@@ -14,7 +11,61 @@ module Fog
           request(options)
         end
 
-      end
+      end # Real
+
+      class Mock
+        def authorize_security_group_ingress(options={})
+          security_group_id      = options['securitygroupid']
+          security_group_rule_id = Fog::Cloudstack.uuid
+
+          unless cidr = options['cidrlist']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command missing parameter cidr')
+          end
+
+          unless start_port = options['startport']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command missing parameter start_port')
+          end
+
+          unless end_port = options['endport']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command missing parameter end_port')
+          end
+
+          unless protocol = options['protocol']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command missing parameter protocol')
+          end
+
+          rule = {
+            "ruleid"    => security_group_rule_id,
+            "cidr"      => cidr,
+            "startport" => start_port,
+            "endport"   => end_port,
+            "protocol"  => protocol
+          }
+
+          unless security_group = self.data[:security_groups][security_group_id]
+            raise Fog::Compute::Cloudstack::BadRequest.new("Security group id #{security_group_id} does not exist")
+          end
+
+          security_group["ingressrule"] ||= []
+          security_group["ingressrule"] << rule
+
+          job_id = Fog::Cloudstack.uuid
+          job = {
+            "cmd"           => "com.cloud.api.commands.authorizeSecurityGroupIngress",
+            "created"       => Time.now.iso8601,
+            "jobid"         => job_id,
+            "jobstatus"     => 1,
+            "jobprocstatus" => 0,
+            "jobresultcode" => 0,
+            "jobresulttype" => "object",
+            "jobresult"     => { "securitygroup" => security_group }
+          }
+
+          self.data[:jobs][job_id]= job
+
+          { "authorizesecuritygroupingressresponse" => { "jobid" => job_id } }
+        end
+      end # Mock
     end
   end
 end

data/lib/fog/cloudstack/requests/compute/create_security_group.rb

@@ -2,10 +2,6 @@ module Fog
   module Compute
     class Cloudstack
       class Real
-
-        # Creates an account.
-        #
-        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/createSecurityGroup.html]
         def create_security_group(options={})
           options.merge!(
             'command' => 'createSecurityGroup'
@@ -13,7 +9,19 @@ module Fog
 
           request(options)
         end
+      end # Real
+
+      class Mock
+        def create_security_group(options={})
+          security_group_id = Fog::Cloudstack.uuid
 
+          security_group = {
+            "id" => security_group_id,
+          }.merge(options)
+
+          self.data[:security_groups][security_group_id]= security_group
+          {"createsecuritygroupresponse" => { "securitygroup" => security_group}}
+        end
       end
     end
   end

data/lib/fog/cloudstack/requests/compute/create_zone.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+
+        # Lists zones.
+        #
+        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listZones.html]
+        def create_zone(options={})
+          options.merge!(
+            'command' => 'createZone'
+          )
+
+          request(options)
+        end
+
+      end # Real
+    end # Cloudstack
+  end # Compute
+end # Fog

data/lib/fog/cloudstack/requests/compute/delete_security_group.rb

@@ -14,7 +14,24 @@ module Fog
           request(options)
         end
 
+      end # Real
+
+      class Mock
+        def delete_security_group(options={})
+          security_group_id = options['id']
+          if self.data[:security_groups][security_group_id]
+            self.data[:security_groups].delete(security_group_id)
+            {
+              "deletesecuritygroupresponse" => {
+                "success" => "true"
+              }
+            }
+          else
+            raise Fog::Compute::Cloudstack::BadRequest.new('No security_group found')
+          end
+        end
       end
+
     end
   end
 end

data/lib/fog/cloudstack/requests/compute/destroy_virtual_machine.rb

@@ -19,9 +19,31 @@ module Fog
       class Mock
 
         def destroy_virtual_machine(options={})
-          identity = options[:id]
+          identity = options["id"]
 
+          server = self.data[:servers][identity]
+          unless server
+            raise Fog::Compute::Cloudstack::BadRequest.new("Unable to execute API command attachserver due to invalid value. Object servers(uuid: #{identity}) does not exist.")
+          end
+
+          job_id = Fog::Cloudstack.uuid
+
+          job = {
+            "cmd"           => "com.cloud.api.commands.DestroyVirtualMachineCmd",
+            "created"       => Time.now.iso8601,
+            "jobid"         => job_id,
+            "jobstatus"     => 1,
+            "jobprocstatus" => 0,
+            "jobresultcode" => 0,
+            "jobresulttype" => "object",
+            "jobresult"     =>
+              {"virtualmachine" => server}
+          }
+
+          self.data[:jobs][job_id]= job
           self.data[:servers].delete(identity)
+
+          {"destroyvirtualmachineresponse" => {"jobid" => job_id}}
         end
       end
     end # Cloudstack

data/lib/fog/cloudstack/requests/compute/list_firewall_rules.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+        def list_firewall_rules(options={})
+          options.merge!(
+            'command' => 'listFirewallRules'
+          )
+          request(options)
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/list_security_groups.rb

@@ -3,17 +3,35 @@ module Fog
     class Cloudstack
       class Real
 
-        # Lists security groups.
-        #
-        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/listSecurityGroups.html]
         def list_security_groups(options={})
           options.merge!(
             'command' => 'listSecurityGroups'
           )
-          
+
           request(options)
         end
 
+      end # Real
+
+      class Mock
+        def list_security_groups(options={})
+          security_groups = []
+          if security_group_id = options['id']
+            security_group = self.data[:security_groups][security_group_id]
+            raise Fog::Compute::Cloudstack::BadRequest unless security_group
+            security_groups = [security_group]
+          else
+            security_groups = self.data[:security_groups].values
+          end
+
+          {
+            "listsecuritygroupsresponse" =>
+            {
+              "count"         => security_groups.size,
+              "securitygroup" => security_groups
+            }
+          }
+        end
       end
     end
   end

data/lib/fog/cloudstack/requests/compute/query_async_job_result.rb

@@ -3,9 +3,6 @@ module Fog
     class Cloudstack
       class Real
 
-        # Creates a domain.
-        #
-        # {CloudStack API Reference}[http://download.cloud.com/releases/2.2.0/api_2.2.4/global_admin/queryAsyncJobResult.html]
         def query_async_job_result(options={})
           options.merge!(
             'command' => 'queryAsyncJobResult'
@@ -14,7 +11,22 @@ module Fog
           request(options)
         end
 
+      end # Real
+
+      class Mock
+        def query_async_job_result(options={})
+          unless job_id = options['jobid']
+            raise Fog::Compute::Cloudstack::BadRequest.new("Missing required parameter jobid")
+          end
+
+          unless job = self.data[:jobs][job_id]
+            raise Fog::Compute::Cloudstack::BadRequest.new("Unknown job id #{job_id}")
+          end
+
+          {'queryasyncjobresultresponse' => job }
+        end
       end
+
     end
   end
 end

data/lib/fog/cloudstack/requests/compute/revoke_security_group_egress.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Real
+        def revoke_security_group_egress(options={})
+          options.merge!(
+            'command' => 'revokeSecurityGroupEgress'
+          )
+
+          request(options)
+        end
+      end # Real
+      class Mock
+        def revoke_security_group_egress(options={})
+          unless security_group_rule_id = options['id']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command missing parameter id')
+          end
+
+          security_group = self.data[:security_groups].values.find do |group|
+            (rule = (group['egressrule'] || []).find{|r| r['ruleid'] == security_group_rule_id}) && group['egressrule'].delete(rule)
+          end
+
+          job_id = Fog::Cloudstack.uuid
+          job = {
+            "cmd"           => "com.cloud.api.commands.revokeSecurityGroupEgress",
+            "created"       => Time.now.iso8601,
+            "jobid"         => job_id,
+            "jobstatus"     => 1,
+            "jobprocstatus" => 0,
+            "jobresultcode" => 0,
+            "jobresulttype" => "object",
+            "jobresult"     => { "securitygroup" => security_group }
+          }
+
+          self.data[:jobs][job_id]= job
+
+          {"revokesecuritygroupegress" => { "jobid" => job_id }}
+        end
+      end # Mock
+    end
+  end
+end