fog 1.1.2 → 1.2.0

data/tests/cloudstack/requests/os_type_tests.rb

@@ -0,0 +1,38 @@
+Shindo.tests('Fog::Compute[:cloudstack] | os type requests', ['cloudstack']) do
+
+  @os_types_format = {
+    'listostypesresponse'  => {
+      'count' => Integer,
+      'ostype' => [
+        'id' => Integer,
+        'description' => String,
+        'oscategoryid' => Integer
+      ]
+    }
+  }
+
+  @os_categories_format = {
+    'listoscategoriesresponse'  => {
+      'count' => Integer,
+      'oscategory' => [
+        'id' => Integer,
+        'name' => String
+      ]
+    }
+  }
+
+  tests('success') do
+
+    tests('#list_os_types').formats(@os_types_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:cloudstack].list_os_types
+    end
+    
+    tests('#list_os_categories').formats(@os_categories_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:cloudstack].list_os_categories
+    end
+
+  end
+
+end

data/tests/cloudstack/requests/security_group_tests.rb

@@ -0,0 +1,29 @@
+Shindo.tests('Fog::Compute[:cloudstack] | security group requests', ['cloudstack']) do
+
+  @security_groups_format = {
+    'listsecuritygroupsresponse'  => {
+      'count' => Integer,
+      'securitygroup' => [
+        'id' => Integer,
+        'account' => String,
+        'description' => Fog::Nullable::String,
+        'domain' => String,
+        'domainid' => Integer,
+        'jobid' => Fog::Nullable::Integer,
+        'jobstatus' => Fog::Nullable::String,
+        'name' => String,
+        'ingressrule' => Fog::Nullable::Array
+      ]
+    }
+  }
+
+  tests('success') do
+
+    tests('#list_security_groups').formats(@security_groups_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:cloudstack].list_security_groups
+    end
+
+  end
+
+end

data/tests/cloudstack/requests/service_offering_tests.rb

@@ -0,0 +1,38 @@
+Shindo.tests('Fog::Compute[:cloudstack] | service offering requests', ['cloudstack']) do
+
+  @service_offerings_format = {
+    'listserviceofferingsresponse'  => {
+      'count' => Integer,
+      'serviceoffering' => [
+        'id' => Integer,
+        'cpuspeed' => Integer,
+        'cpunumber' => Integer,
+        'created' => String,
+        'defaultuse' => Fog::Boolean,
+        'displaytext' => String,
+        'domain' => Fog::Nullable::String,
+        'domainid' => Fog::Nullable::Integer,
+        'hosttags' => Fog::Nullable::String,
+        'issystem' => Fog::Boolean,
+        'limitcpuuse' => Fog::Boolean,
+        'memory' => Integer,
+        'name' => String,
+        'networkrate' => Integer,
+        'offerha' => Fog::Boolean,
+        'storagetype' => String,
+        'systemvmtype' => Fog::Nullable::String,
+        'tags' => Fog::Nullable::String
+      ]
+    }
+  }
+
+  tests('success') do
+
+    tests('#list_service_offerings').formats(@service_offerings_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:cloudstack].list_service_offerings
+    end
+
+  end
+
+end

data/tests/cloudstack/requests/snapshot_tests.rb

@@ -0,0 +1,32 @@
+Shindo.tests('Fog::Compute[:cloudstack] | snapshot requests', ['cloudstack']) do
+
+  @snapshots_format = {
+    'listsnapshotsresponse'  => {
+      'count' => Integer,
+      'snapshot' => [
+        'id' => Integer,
+        'account' => String,
+        'domainid' => Integer,
+        'domain' => String,
+        'snapshottype' => String,
+        'volumeid' => Integer,
+        'volumename' => String,
+        'volumetype' => String,
+        'created' => String,
+        'name' => String,
+        'intervaltype' => String,
+        'state' => String
+      ]
+    }
+  }
+
+  tests('success') do
+
+    tests('#list_snapshots').formats(@snapshots_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:cloudstack].list_snapshots
+    end
+
+  end
+
+end

data/tests/cloudstack/requests/ssh_key_pair_tests.rb

@@ -0,0 +1,23 @@
+Shindo.tests('Fog::Compute[:cloudstack] | ssh key pairs requests', ['cloudstack']) do
+
+  @ssh_keys_format = {
+    'listsshkeypairsresponse'  => {
+      'count' => Integer,
+      'sshkeypair' => [
+        'fingerprint' => String,
+        'name' => String,
+        'privatekey' => Fog::Nullable::String
+      ]
+    }
+  }
+
+  tests('success') do
+
+    tests('#list_ssh_key_pairs').formats(@ssh_keys_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:cloudstack].list_ssh_key_pairs
+    end
+
+  end
+
+end

data/tests/cloudstack/requests/template_tests.rb

@@ -0,0 +1,53 @@
+Shindo.tests('Fog::Compute[:cloudstack] | template requests', ['cloudstack']) do
+
+  @templates_format = {
+    'listtemplatesresponse'  => {
+      'count' => Integer,
+      'template' => [
+        '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,
+        'status' => Fog::Nullable::String,
+        'size' => Fog::Nullable::Integer,
+        'templatetype' => String,
+        'hypervisor' => String,
+        'domain' => String,
+        'domainid' => Integer,
+        'isextractable' => Fog::Boolean,
+        'checksum' => Fog::Nullable::String,
+        'sourcetemplateid' => Fog::Nullable::Integer,
+        'accountid' => Fog::Nullable::Integer,        
+        'bootable' => Fog::Nullable::Boolean,
+        'hostid' => Fog::Nullable::Integer,
+        'hostname' => Fog::Nullable::String,
+        'jobid' => Fog::Nullable::Integer,
+        'jobstatus' => Fog::Nullable::Integer,
+        'removed' => Fog::Nullable::Boolean,
+        'templatetag' => Fog::Nullable::String,
+        'templatetype' => Fog::Nullable::String
+      ]
+    }
+  }
+
+  tests('success') do
+
+    tests('#list_templates').formats(@templates_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:cloudstack].list_templates('templateFilter' => "executable")
+    end
+
+  end
+
+end

data/tests/cloudstack/requests/virtual_machine_tests.rb

@@ -0,0 +1,71 @@
+Shindo.tests('Fog::Compute[:cloudstack] | virtual machine requests', ['cloudstack']) do
+
+  @virtual_machines_format = {
+    'listvirtualmachinesresponse'  => {
+      'count' => Integer,
+      'virtualmachine' => [
+        'id' => Integer,
+        'name' => String,
+        'displayname' => String,
+        'account' => String,
+        'domainid' => Integer,
+        'domain' => String,
+        'created' => String,
+        'state' => String,
+        'haenable' => Fog::Boolean,
+        'zoneid' => Integer,
+        'zonename' => String,
+        'hostid' => Fog::Nullable::String,
+        'hostname' => Fog::Nullable::String,
+        'templateid' => Integer,
+        'templatename' => String,
+        'templatedisplaytext' => String,
+        'passwordenabled' => Fog::Boolean,
+        'serviceofferingid' => Integer,
+        'serviceofferingname' => String,
+        'cpunumber' => Integer,
+        'cpuspeed' => Integer,
+        'networkkbsread' => Fog::Nullable::Integer,
+        'memory' => Integer,
+        'cpuused' => Fog::Nullable::String,
+        'guestosid' => Integer,
+        'networkkbswrite' => Fog::Nullable::Integer,
+        'rootdeviceid' => Integer,
+        'rootdevicetype' => String,
+        'hypervisor' => String,
+        'group' => Fog::Nullable::String,
+        'groupid' => Fog::Nullable::Integer,
+        'isoname' => Fog::Nullable::String,
+        'isoid' => Fog::Nullable::Integer,
+        'securitygroup' => [
+           'id' => Integer,
+           'name' => Fog::Nullable::String,
+           'description' => Fog::Nullable::String
+        ],
+        'nic' => [
+          'id' => Integer,
+          'networkid' => Integer,
+          'netmask' => String,
+          'gateway' => String,
+          'ipaddress' => String,
+          'traffictype' => String,
+          'type' => String,
+          'isdefault' => Fog::Boolean,
+          'macaddress' => String,
+          'broadcasturi' => Fog::Nullable::String,
+          'isolationuri' => Fog::Nullable::String
+        ]
+      ]
+    }
+  }
+
+  tests('success') do
+
+    tests('#list_virtual_machines').formats(@virtual_machines_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:cloudstack].list_virtual_machines
+    end
+
+  end
+
+end

data/tests/cloudstack/requests/volume_tests.rb

@@ -0,0 +1,48 @@
+Shindo.tests('Fog::Compute[:cloudstack] | volume requests', ['cloudstack']) do
+
+  @volumes_format = {
+    'listvolumesresponse'  => {
+      'count' => Integer,
+      'volume' => [
+        'id' => Integer,
+        'name' => String,
+        'zoneid' => Integer,
+        'zonename' => String,
+        'type' => String,
+        'size' => Integer,
+        'created' => String,
+        'account' => String,
+        'domainid' => Integer,
+        'domain' => String,
+        'state' => String,
+        'storagetype' => String,
+        'hypervisor' => String,
+        'diskofferingid' => Fog::Nullable::Integer,
+        'diskofferingname' => Fog::Nullable::String,
+        'diskofferingdisplaytext' => Fog::Nullable::String,
+        'storage' => String,
+        'destroyed' => Fog::Boolean,
+        'isextractable' => Fog::Boolean,
+        'deviceid' => Fog::Nullable::Integer,
+        'virtualmachineid' => Fog::Nullable::Integer,
+        'vmname' => Fog::Nullable::String,
+        'vmdisplayname' => Fog::Nullable::String,
+        'vmstate' => Fog::Nullable::String,
+        'serviceofferingid' => Fog::Nullable::Integer,
+        'serviceofferingname' => Fog::Nullable::String,
+        'serviceofferingdisplaytext' => Fog::Nullable::String,
+        'attached' => Fog::Nullable::String
+      ]
+    }
+  }
+
+  tests('success') do
+
+    tests('#list_volumes').formats(@volumes_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:cloudstack].list_volumes('zoneid' => 1)
+    end
+
+  end
+
+end

data/tests/cloudstack/requests/zone_tests.rb

@@ -0,0 +1,33 @@
+Shindo.tests('Fog::Compute[:cloudstack] | zone requests', ['cloudstack']) do
+
+  @zones_format = {
+    'listzonesresponse'  => {
+      'count' => Integer,
+      'zone' => [
+        'id' => Integer,
+        'name' => String,
+        'dns1' => Fog::Nullable::String,
+        'dns2' => Fog::Nullable::String,
+        'internaldns1' => Fog::Nullable::String,
+        'internaldns2' => Fog::Nullable::String,
+        'vlan' => Fog::Nullable::String,
+        'guestcidraddress' => Fog::Nullable::String,
+        'networktype' => String,
+        'securitygroupsenabled' => Fog::Nullable::Boolean,
+        'allocationstate' => String,
+        'dhcpprovider' => String,
+        'zonetoken' => Fog::Nullable::String
+      ]
+    }
+  }
+
+  tests('success') do
+
+    tests('#list_zones').formats(@zones_format) do
+      pending if Fog.mocking?
+      Fog::Compute[:cloudstack].list_zones
+    end
+
+  end
+
+end

data/tests/cloudstack/signed_params_tests.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+Shindo.tests('Cloudstack | escape', ['cloudstack']) do
+  returns( Fog::Cloudstack.escape( "'Stöp!' said Fred_-~." ) ) { "%27St%C3%B6p%21%27%20said%20Fred_-%7E." }
+end
+
+Shindo.tests('Cloudstack | signed_params', ['cloudstack']) do
+  returns( Fog::Cloudstack.signed_params( 'abcdefg', 'account' => 'Lorem Ipsum', 'domainid' => 42, 'q' => 'keywords' ) ) { "V2CxRU4zQQtox1DZsH/66GDdzhg=" }
+  returns( Fog::Cloudstack.signed_params( 'abcdefg', 'account' => 'Lorem Ipsum', 'domainid' => '42', 'q' => 'keywords' ) ) { "V2CxRU4zQQtox1DZsH/66GDdzhg=" }
+  returns( Fog::Cloudstack.signed_params( 'abcdefg', 'account' => 'Lorem Ipsum', 'domainid' => 42, 'q' => nil ) ) { "5bsDirm5pPgVoreQ6vquKRN+4HI=" }
+  returns( Fog::Cloudstack.signed_params( 'abcdefg', 'account' => 'Lorem Ipsum', 'domainid' => 42, 'q' => '' ) ) { "5bsDirm5pPgVoreQ6vquKRN+4HI=" }
+end

data/tests/compute/helper.rb

@@ -6,8 +6,10 @@ def compute_providers
     },
     :bluebox    => {
       :server_attributes => {
-        :image_id => '03807e08-a13d-44e4-b011-ebec7ef2c928', # Ubuntu 10.04 64bit
-        :password => 'chunkybacon'
+        :flavor_id    => '94fd37a7-2606-47f7-84d5-9000deda52ae', # Block 1GB Virtual Server
+        :image_id     => 'a8f05200-7638-47d1-8282-2474ef57c4c3', # Scientific Linux 6
+        :location_id  => '37c2bd9a-3e81-46c9-b6e2-db44a25cc675', # Seattle, WA
+        :password     => 'chunkybacon'
       },
       :mocked => false
     },
@@ -20,6 +22,9 @@ def compute_providers
     :glesys   => {
       :mocked => false
     },
+    :joyent => {
+      :mocked => false
+    },
     :ninefold   => {
       :mocked => false
     },

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

@@ -11,61 +11,19 @@ class Glesys
             'serverid' => String,
             'hostname' => String,
             'datacenter' => String,
-            'platform' => String,
+            'platform' => String
           }],
           'status' => {
-            'code' => String,
-            'text' => String
-          }
-        }
-
-        CREATE = {
-          'debug' => {
-            'input' => {
-              "rootpw"        => String,
-              "disksize"      => String,
-              "memorysize"    => String,
-              "datacenter"    => String,
-              "cpucores"      => String,
-              "transfer"      => String,
-              "template"      => String,
-              "description"   => String,
-              "hostname"      => String,
-              "platform"      => String
-            }
-          },
-          'server' => {
-            'serverid' => String,
-            'hostname' => String,
-            'iplist' => [{
-              'cost' => String,
-              'version' => String,
-              'ip' => String
-            }]
-          },
-          'status' => {
-            'code' => String,
-            'text' => String
-          }
-        }
-
-        DESTROY = {
-          'debug' => {
-            'input' => {
-              'serverid' => String,
-              'keepip'   => String,
-            }
-          },
-          'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
 
         DETAILS = {
           'debug' => {
             'input' =>  {
-              'serverid'  =>  String
+              'serverid'  =>  Fog::Nullable::String
             }
           },
           'server' => {
@@ -74,29 +32,59 @@ class Glesys
               'amount'      =>  Float,
               'timeperiod'  => String,
               'currency'    => String
-            }, 
-            'serverid'    => String,
-            'datacenter'  => String,
-            'memory'      => String,
-            'cpucores'    => String,
-            'transfer'    => String,
-            'template'    => String,
-            'iplist'      =>  [{
-              'cost'    => String,
-              'version' => String,
-              'ip'      => String
+            },
+            'serverid'      => String,
+            'datacenter'    => String,
+            'memorysize'    => Integer,
+            'cpucores'      => Integer,
+            'transfer'      => Integer,
+            'templatename'  => String,
+            'iplist'        =>  [{
+              'cost'      => Integer,
+              'version'   => Fog::Nullable::Integer,
+              'ipaddress' => Fog::Nullable::String,
+              'currency'  => String
             }], 
             'description' => String,
             'hostname'    => String,
-            'disk'        => String,
-            'platform'    => String
+            'disksize'    => Integer,
+            'platform'    => String,
+            'state'       => Fog::Nullable::String
           },
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
 
+        STOP = DETAILS.merge(
+          'debug' => {
+            'input' =>  {
+              'serverid'  => Fog::Nullable::String,
+              'type'      => String
+            }
+          }
+        )
+
+        CREATE = DETAILS.merge(
+          'debug' => {
+            'input' =>  {
+              'serverid'      => Fog::Nullable::String,
+              'hostname'      => String,
+              'rootpassword'  => String,
+              'datacenter'    => String,
+              'platform'      => String,
+              'templatename'  => String,
+              'disksize'      => String,
+              'memorysize'    => String,
+              'cpucores'      => String,
+              'transfer'      => String,
+              'description'   => String
+            }
+          }
+        )
+
         STATUS = {
           'debug' => {
             'input' => {
@@ -104,44 +92,51 @@ class Glesys
             }
           },
           'server' => {
-            'memory'    => String,
-            'bandwidth' => {
-              'last30days'  => Integer,
-              'today'       => Integer,
-              'max'         => String
+            'memory'    => {
+              'usage' => Fog::Nullable::Integer,
+              'max'   => Fog::Nullable::Integer,
+              'unit'  => Fog::Nullable::String
             },
-            'cpu'     => String,
-            'disk'    => String,
-            'state'   => String
-          },
-          'status' => {
-            'code' => String,
-            'text' => String
-          }
-       }
-
-        START = {
-          'debug' => {
-            'input' => {
-              'serverid' => String
+            'transfer'  => {
+              'usage' => Fog::Nullable::Integer,
+              'max'   => Fog::Nullable::Integer,
+              'unit'  => Fog::Nullable::String
+            },
+            'disk'      => {
+              'usage' => Fog::Nullable::Integer,
+              'max'   => Fog::Nullable::Integer,
+              'unit'  => Fog::Nullable::String
+            },
+            'state'     => String,
+            'transfer'  => {
+              'usage' => Fog::Nullable::Integer,
+              'max'   => Fog::Nullable::Integer,
+              'unit'  => Fog::Nullable::String
+            },
+            'cpu'       => [],
+            'uptime'    => {
+              'current' => Fog::Nullable::Integer,
+              'unit'    => String
             }
           },
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
-        }
+       }
 
-        STOP = {
+        DESTROY = {
           'debug' => {
             'input' => {
-              'serverid'  => String,
-              'type'      => String
+              'serverid' => String,
+              'keepip'   => String
             }
           },
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
 
@@ -153,21 +148,27 @@ class Glesys
             'input' => []
           },
           'iplist' => [{
-            'price' => {
-              'amount' => String,
-              'timeperiod' => String,
-              'currency' => String
+            'cost' => {
+              'amount'      => Integer,
+              'timeperiod'  => String,
+              'currency'    => String
             },
-            'datacenter' => String,
-            'serverid' => Fog::Nullable::String,
-            'platform' => String,
-            'ip'       => String,
-            'version'  => String,
-            'PTR'      => String,
+            'netmask'     => Fog::Nullable::String,
+            'broadcast'   => Fog::Nullable::String,
+            'gateway'     => Fog::Nullable::String,
+            'nameservers' => [],
+            'datacenter'  => String,
+            'serverid'    => Fog::Nullable::String,
+            'platform'    => String,
+            'ipaddress'   => String,
+            'ipversion'   => Integer,
+            'ptr'         => String,
+            'reserved'    => String
           }],
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
 
@@ -179,16 +180,17 @@ class Glesys
               'platform'    => String
             }
           },
-          'iplist' => [],
+          'iplist' => {
+            'ipversion'   => Integer,
+            'datacenter'  => String,
+            'platform'    => String,
+            "ipaddresses" => []
+          },
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           },
-          'ipinfo' => {
-            'datacenter' => String,
-            'ipversion'  => Integer,
-            'platform'   => String
-          }
         }
 
         IPLIST_CATCH_RELEASE = {
@@ -197,9 +199,29 @@ class Glesys
               'ipaddress' => String,
             }
           },
+          'details' => {
+            'cost' => {
+              'amount'      => Integer,
+              'timeperiod'  => String,
+              'currency'    => String
+            },
+            'ipaddress'   => String,
+            'netmask'     => String,
+            'broadcast'   => String,
+            'gateway'     => String,
+            'nameservers' => [],
+            'datacenter'  => String,
+            'serverid'    => Fog::Nullable::String,
+            'platform'    => String,
+            'ipaddress'   => String,
+            'ipversion'   => Integer,
+            'ptr'         => String,
+            'reserved'    => String
+          },
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
 
@@ -212,23 +234,24 @@ class Glesys
           },
           'templates' =>  {
             'Xen' => [{
-              'name'          => String,
-              'os'            => String,
-              'min_mem_size'  => String,
-              'min_disk_size' => String,
-              'platform'      => String
+              'name'              => String,
+              'operatingsystem'   => String,
+              'minimummemorysize' => Integer,
+              'minimumdisksize'   => Integer,
+              'platform'          => String
             }],
             'OpenVZ' => [{
-              'name'          => String,
-              'os'            => String,
-              'min_mem_size'  => String,
-              'min_disk_size' => String,
-              'platform'      => String
+              'name'              => String,
+              'operatingsystem'   => String,
+              'minimummemorysize' => Integer,
+              'minimumdisksize'   => Integer,
+              'platform'          => String
             }]
           },
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }