fog 0.8.2 → 0.9.0

data/tests/compute/requests/linode/linodeplans_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Linode::Compute | linodeplans requests', ['linode']) do
+Shindo.tests('Fog::Compute[:linode] | linodeplans requests', ['linode']) do
 
   @linodeplans_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{ 
@@ -24,14 +24,14 @@ Shindo.tests('Linode::Compute | linodeplans requests', ['linode']) do
 
     tests('#avail_linodeplans').formats(@linodeplans_format) do
       pending if Fog.mocking?
-      data = Linode[:compute].avail_linodeplans.body
+      data = Fog::Compute[:linode].avail_linodeplans.body
       @linodeplan_id = data['DATA'].first['PLANID']
       data
     end
 
     tests("#avail_linodeplans(#{@linodeplan_id})").formats(@linodeplans_format) do
       pending if Fog.mocking?
-      Linode[:compute].avail_linodeplans(@linodeplan_id).body
+      Fog::Compute[:linode].avail_linodeplans(@linodeplan_id).body
     end
 
   end

data/tests/compute/requests/linode/stackscripts_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Linode::Compute | stack_script requests', ['linode']) do
+Shindo.tests('Fog::Compute[:linode] | stack_script requests', ['linode']) do
 
   @stack_scripts_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{ 
@@ -22,12 +22,13 @@ Shindo.tests('Linode::Compute | stack_script requests', ['linode']) do
 
     tests('#avail_stackscripts').formats(@stack_scripts_format) do
       pending if Fog.mocking?
-      Linode[:compute].avail_stackscripts.body
+      Fog::Compute[:linode].avail_stackscripts.body
     end    
     
     tests('#stackscript_list').formats(@stack_scripts_format) do
+      pending # TODO: REV_NOTE can be either string or float?
       pending if Fog.mocking?
-      Linode[:compute].stackscript_list.body
+      Fog::Compute[:linode].stackscript_list.body
     end
 
   end

data/tests/compute/requests/ninefold/address_tests.rb

@@ -0,0 +1,42 @@
+Shindo.tests('Fog::Compute[:ninefold] | address requests', ['ninefold']) do
+
+  tests('success') do
+
+    tests("#associate_ip_address()").formats(Ninefold::Compute::Formats::Addresses::ADDRESS) do
+      pending if Fog.mocking?
+      job = newaddress = Fog::Compute[:ninefold].associate_ip_address(:zoneid => Ninefold::Compute::TestSupport::ZONE_ID)
+      while Fog::Compute[:ninefold].query_async_job_result(:jobid => job['jobid'])['jobstatus'] == 0
+        sleep 1
+      end
+      result = Fog::Compute[:ninefold].query_async_job_result(:jobid => job['jobid'])['jobresult']['ipaddress']
+      @newaddressid = result['id']
+      result
+    end
+
+    tests("#list_public_ip_addresses()").formats(Ninefold::Compute::Formats::Addresses::ADDRESSES) do
+      pending if Fog.mocking?
+      result = Fog::Compute[:ninefold].list_public_ip_addresses
+      result
+    end
+
+    tests("#disassociate_ip_address()").formats(Ninefold::Compute::Formats::Addresses::DISASSOC_ADDRESS) do
+      pending if Fog.mocking?
+      job = Fog::Compute[:ninefold].disassociate_ip_address(:id => @newaddressid)
+      while Fog::Compute[:ninefold].query_async_job_result(:jobid => job['jobid'])['jobstatus'] == 0
+        sleep 1
+      end
+      job
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#associate_ip_address()").raises(Excon::Errors::HTTPStatusError) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].associate_ip_address
+    end
+
+  end
+
+end

data/tests/compute/requests/ninefold/async_job_tests.rb

@@ -0,0 +1,33 @@
+# This will fail until there are jobs in the system.
+
+Shindo.tests('Fog::Compute[:ninefold] | async job requests', ['ninefold']) do
+
+  tests('success') do
+
+    tests("#list_async_jobs()").formats(Ninefold::Compute::Formats::Jobs::JOBS) do
+      pending if Fog.mocking?
+      jobs = Fog::Compute[:ninefold].list_async_jobs()
+      unless jobs[0]
+        raise "No async jobs in system yet - create a VM through web UI to create"
+      end
+      @jobid = jobs[0]['jobid']
+      jobs
+    end
+
+    tests("#query_async_job_result()").formats(Ninefold::Compute::Formats::Jobs::JOB_QUERY) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].query_async_job_result(:jobid => @jobid)
+    end
+
+  end
+
+  tests('failure') do
+
+    #tests("#deploy_virtual_machine()").raises(Excon::Errors::HTTPStatusError) do
+    #  pending if Fog.mocking?
+    #  Fog::Compute[:ninefold].deploy_virtual_machine
+    #end
+
+  end
+
+end

data/tests/compute/requests/ninefold/helper.rb

@@ -0,0 +1,320 @@
+class Ninefold
+  module Compute
+    module TestSupport
+      # 1CPU, 1.7GB RAM, 160GB Storage
+      SERVICE_OFFERING = 67
+      # alternate for testing -
+      ALT_SERVICE_OFFERING = 68
+      # XEN Basic Ubuntu 10.04 Server x64 PV r2.0
+      TEMPLATE_ID = 421
+      # Sydney
+      ZONE_ID = 1
+      # Max time to wait for job completion (2 mins)
+      MAXWAIT = 2 * 60
+
+      ## Waits for a job, returning the completed jobs payload.
+      ## Accepts an integer jobid, or a hash containing a jobid or id.
+      def wait_for_job(job)
+        job = job['jobid'] || job['id'] unless job.kind_of? Integer
+        while Fog::Compute[:ninefold].query_async_job_result(:jobid => job)['jobstatus'] == 0
+          sleep 1
+        end
+        Fog::Compute[:ninefold].query_async_job_result(:jobid => job)
+      end
+      module_function :wait_for_job
+
+    end
+    module Formats
+      module Lists
+        SERVICE_OFFERING = {
+          "id" => Integer,
+          "name" => String,
+          "displaytext" => String,
+          "cpunumber" => Integer,
+          "cpuspeed" => Integer,
+          "memory" => Integer,
+          "created" => String,
+          "storagetype" => String,
+          "offerha" => Fog::Boolean,
+          "domainid" => Integer,
+          "domain" => String
+        }
+        #SERVICE_OFFERINGS = [Ninefold::Compute::Formats::Lists::SERVICE_OFFERING]
+        ACCOUNTS = [{
+                      "id"=>Integer,
+                      "name"=>String,
+                      "accounttype"=>Integer,
+                      "domainid"=>Integer,
+                      "domain"=>String,
+                      "receivedbytes"=>Integer,
+                      "sentbytes"=>Integer,
+                      "vmlimit"=>String,
+                      "vmtotal"=>Integer,
+                      "vmavailable"=>String,
+                      "iplimit"=>String,
+                      "iptotal"=>Integer,
+                      "ipavailable"=>String,
+                      "volumelimit"=>String,
+                      "volumetotal"=>Integer,
+                      "volumeavailable"=>String,
+                      "snapshotlimit"=>String,
+                      "snapshottotal"=>Integer,
+                      "snapshotavailable"=>String,
+                      "templatelimit"=>String,
+                      "templatetotal"=>Integer,
+                      "templateavailable"=>String,
+                      "vmstopped"=>Integer,
+                      "vmrunning"=>Integer,
+                      "state"=>String,
+                      "user"=> [{
+                                  "id"=>Integer,
+                                  "username"=>String,
+                                  "firstname"=>String,
+                                  "lastname"=>String,
+                                  "email"=>String,
+                                  "created"=>String,
+                                  "state"=>String,
+                                  "account"=>String,
+                                  "accounttype"=>Integer,
+                                  "domainid"=>Integer,
+                                  "domain"=>String,
+                                  "apikey"=>String,
+                                  "secretkey"=>String
+                                }]
+                    }]
+        EVENTS = [{
+                    "id"=>Integer,
+                    "username"=>String,
+                    "type"=>String,
+                    "level"=>String,
+                    "description"=>String,
+                    "account"=>String,
+                    "domainid"=>Integer,
+                    "domain"=>String,
+                    "created"=>String,
+                    "state"=>String,
+                    "parentid"=>Integer
+                  }]
+        SERVICE_OFFERINGS = [{
+                               "id"=>Integer,
+                               "name"=>String,
+                               "displaytext"=>String,
+                               "cpunumber"=>Integer,
+                               "cpuspeed"=>Integer,
+                               "memory"=>Integer,
+                               "created"=>String,
+                               "storagetype"=>String,
+                               "offerha"=>Fog::Boolean,
+                               "domainid"=>Integer,
+                               "domain"=>String
+                             }]
+        DISK_OFFERINGS = [{
+                            "id"=>Integer,
+                            "domainid"=>Integer,
+                            "domain"=>String,
+                            "name"=>String,
+                            "displaytext"=>String,
+                            "disksize"=>Integer,
+                            "created"=>String,
+                            "iscustomized"=>Fog::Boolean,
+                            "tags"=>String
+                          }]
+        CAPABILITIES = {
+          "securitygroupsenabled" => Fog::Boolean,
+          "cloudstackversion" => String,
+          "userpublictemplateenabled" => Fog::Boolean
+        }
+        HYPERVISORS = [{
+                         "name"=>String
+                       }]
+        ZONES = [{
+                   "id"=>Integer,
+                   "name"=>String,
+                   "networktype"=>String,
+                   "securitygroupsenabled"=>Fog::Boolean
+                 }]
+        NETWORK_OFFERINGS = [{
+                               "id"=>Integer,
+                               "name"=>String,
+                               "displaytext"=>String,
+                               "traffictype"=>String,
+                               "isdefault"=>Fog::Boolean,
+                               "specifyvlan"=>Fog::Boolean,
+                               "availability"=>String,
+                               "guestiptype"=>String,
+                               "networkrate"=>Integer
+                             }]
+        RESOURCE_LIMITS = [{
+                             "account"=>String,
+                             "domainid"=>Integer,
+                             "domain"=>String,
+                             "resourcetype"=>String,
+                             "max"=>Integer
+                           }]
+      end
+      module VirtualMachines
+        VIRTUAL_MACHINE = {
+          "id"=>Integer,
+          "name"=>String,
+          "displayname"=>String,
+          "account"=>String,
+          "domainid"=>Integer,
+          "domain"=>String,
+          "created"=>String,
+          "state"=>String,
+          "haenable"=>Fog::Boolean,
+          "zoneid"=>Integer,
+          "zonename"=>String,
+          "templateid"=>Integer,
+          "templatename"=>String,
+          "templatedisplaytext"=>String,
+          "passwordenabled"=>Fog::Boolean,
+          "serviceofferingid"=>Integer,
+          "serviceofferingname"=>String,
+          "cpunumber"=>Integer,
+          "cpuspeed"=>Integer,
+          "memory"=>Integer,
+          "guestosid"=>Integer,
+          "rootdeviceid"=>Integer,
+          "rootdevicetype"=>String,
+          "securitygroup"=>Array,
+          "nic"=>[{
+                    "id"=>Integer,
+                    "networkid"=>Integer,
+                    "netmask"=>Fog::Nullable::String,
+                    "gateway"=>Fog::Nullable::String,
+                    "ipaddress"=>Fog::Nullable::String,
+                    "traffictype"=>String,
+                    "type"=>String,
+                    "isdefault"=>Fog::Boolean,
+                  }],
+          "hypervisor"=>String,
+          "cpuused"=>Fog::Nullable::String,
+          "networkkbsread"=>Fog::Nullable::Integer,
+          "networkkbswrite"=>Fog::Nullable::Integer
+        }
+        VIRTUAL_MACHINES = [VIRTUAL_MACHINE]
+      end
+      module Templates
+        TEMPLATES = [{
+                      "id"=>Integer,
+                       "name"=>String,
+                       "displaytext"=>String,
+                       "ispublic"=>Fog::Boolean,
+                       "created"=>String,
+                       "isready"=>Fog::Boolean,
+                       "passwordenabled"=>Fog::Boolean,
+                       "format"=>String,
+                       "isfeatured"=>Fog::Boolean,
+                       "crossZones"=>Fog::Boolean,
+                       "ostypeid"=>Integer,
+                       "ostypename"=>String,
+                       "account"=>String,
+                       "zoneid"=>Integer,
+                       "zonename"=>String,
+                       "size"=>Integer,
+                       "templatetype"=>String,
+                       "hypervisor"=>String,
+                       "domain"=>String,
+                       "domainid"=>Integer,
+                       "isextractable"=>Fog::Boolean,
+                     }]
+      end
+      module Jobs
+        JOB = {
+          "jobid"=>Integer,
+          "accountid"=>Integer,
+          "userid"=>Integer,
+          "cmd"=>String,
+          "jobstatus"=>Integer,
+          "jobprocstatus"=>Integer,
+          "jobresultcode"=>Integer,
+          "jobresult"=>Hash,
+          "created"=>String
+        }
+        JOBS = [JOB]
+        JOB_QUERY = {
+          "jobid"=>Integer,
+          "jobstatus"=>Integer,
+          "jobprocstatus"=>Integer,
+          "jobresultcode"=>Integer,
+          "jobresulttype"=>String,
+          "jobresult"=>Hash
+        }
+      end
+      module Networks
+        NETWORKS=[{"id"=>Integer,
+                    "name"=>String,
+                    "displaytext"=>String,
+                    "broadcastdomaintype"=>String,
+                    "traffictype"=>String,
+                    "zoneid"=>Integer,
+                    "networkofferingid"=>Integer,
+                    "networkofferingname"=>String,
+                    "networkofferingdisplaytext"=>String,
+                    "networkofferingavailability"=>String,
+                    "isshared"=>Fog::Boolean,
+                    "issystem"=>Fog::Boolean,
+                    "state"=>String,
+                    "related"=>Integer,
+                    "broadcasturi"=>Fog::Nullable::String,
+                    "dns1"=>String,
+                    "dns2"=>String,
+                    "type"=>String,
+                    "account"=>String,
+                    "domainid"=>Integer,
+                    "domain"=>String,
+                    "isdefault"=>Fog::Boolean,
+                    "service"=>Array,
+                    "networkdomain"=>String,
+                    "securitygroupenabled"=>Fog::Boolean
+                    }]
+      end
+      module Addresses
+        ADDRESS = {
+          "id"=>Integer,
+          "ipaddress"=>String,
+          "allocated"=>String,
+          "zoneid"=>Integer,
+          "zonename"=>String,
+          "issourcenat"=>Fog::Boolean,
+          "account"=>String,
+          "domainid"=>Integer,
+          "domain"=>String,
+          "forvirtualnetwork"=>Fog::Boolean,
+          "isstaticnat"=>Fog::Boolean,
+          "associatednetworkid"=>Integer,
+          "networkid"=>Integer,
+          "state"=>String,
+          "virtualmachineid"=>Fog::Nullable::Integer,
+          "virtualmachinename"=>Fog::Nullable::String
+        }
+        ADDRESSES = [ADDRESS]
+        DISASSOC_ADDRESS = {"jobid"=>Integer}
+      end
+      module Nat
+        ENABLE_NAT_RESPONSE = {
+          'success' => String
+        }
+        DISABLE_NAT_RESPONSE = {
+          'success' => Fog::Boolean
+        }
+        DELETE_RULE_RESPONSE = {
+          'success' => Fog::Boolean
+        }
+        FORWARDING_RULE = {
+          "id"=>Integer,
+          "protocol"=>String,
+          "virtualmachineid"=>Integer,
+          "virtualmachinename"=>String,
+          "ipaddressid"=>Integer,
+          "ipaddress"=>String,
+          "startport"=>Integer,
+          "endport"=>Integer,
+          "state"=>String
+        }
+        FORWARDING_RULES = [FORWARDING_RULE]
+      end
+    end
+  end
+end

data/tests/compute/requests/ninefold/list_tests.rb

@@ -0,0 +1,56 @@
+Shindo.tests('Fog::Compute[:ninefold] | list only requests', ['ninefold']) do
+
+  tests('success') do
+
+    tests("#list_accounts()").formats(Ninefold::Compute::Formats::Lists::ACCOUNTS) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].list_accounts
+    end
+
+    tests("#list_events()").formats(Ninefold::Compute::Formats::Lists::EVENTS) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].list_events
+    end
+
+    tests("#list_service_offerings()").formats(Ninefold::Compute::Formats::Lists::SERVICE_OFFERINGS) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].list_service_offerings
+    end
+
+    tests("#list_disk_offerings()").formats(Ninefold::Compute::Formats::Lists::DISK_OFFERINGS) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].list_disk_offerings
+    end
+
+    tests("#list_capabilities()").formats(Ninefold::Compute::Formats::Lists::CAPABILITIES) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].list_capabilities
+    end
+
+    tests("#list_hypervisors()").formats(Ninefold::Compute::Formats::Lists::HYPERVISORS) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].list_hypervisors
+    end
+
+    tests("#list_zones()").formats(Ninefold::Compute::Formats::Lists::ZONES) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].list_zones
+    end
+
+    tests("#list_network_offerings()").formats(Ninefold::Compute::Formats::Lists::NETWORK_OFFERINGS) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].list_network_offerings
+    end
+
+    tests("#list_resource_limits()").formats(Ninefold::Compute::Formats::Lists::RESOURCE_LIMITS) do
+      pending if Fog.mocking?
+      Fog::Compute[:ninefold].list_resource_limits
+    end
+
+  end
+
+  tests('failure') do
+
+  end
+
+end