fog 1.28.0 → 1.29.0

data/lib/fog/ovirt/requests/compute/mock_files/affinitygroup.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<affinity_group href="/api/clusters/a240aac1-d03a-4c69-923e-a295200539fa/affinitygroups/9aaec56b-e24d-4fce-82a1-21a7b642ab0f" id="9aaec56b-e24d-4fce-82a1-21a7b642ab0f">
+    <name>test1_ag</name>
+    <link href="/api/clusters/a240aac1-d03a-4c69-923e-a295200539fa/affinitygroups/9aaec56b-e24d-4fce-82a1-21a7b642ab0f/vms" rel="vms"/>
+    <cluster href="/api/clusters/a240aac1-d03a-4c69-923e-a295200539fa" id="a240aac1-d03a-4c69-923e-a295200539fa"/>
+    <positive>true</positive>
+    <enforcing>false</enforcing>
+</affinity_group>

data/lib/fog/ovirt/requests/compute/mock_files/affinitygroup_vms.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<vms>
+	<vm href="/api/vms/5ee86332-7b19-465b-8801-2a12ed0d6c1b" id="5ee86332-7b19-465b-8801-2a12ed0d6c1b">
+		<name>test-vm1</name>
+    </vm>
+	<vm href="/api/vms/349764bb-eba3-4466-abef-f18f4c40c9f1" id="349764bb-eba3-4466-abef-f18f4c40c9f1">
+		<name>fosdem</name>
+    </vm>
+</vms>

data/lib/fog/ovirt/requests/compute/mock_files/affinitygroups.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<affinity_groups>
+    <affinity_group href="/api/clusters/a240aac1-d03a-4c69-923e-a295200539fa/affinitygroups/ff73a83f-10b2-44ae-8c98-a29b13ae0c19" id="ff73a83f-10b2-44ae-8c98-a29b13ae0c19">
+        <name>test2_ag</name>
+        <link href="/api/clusters/a240aac1-d03a-4c69-923e-a295200539fa/affinitygroups/ff73a83f-10b2-44ae-8c98-a29b13ae0c19/vms" rel="vms"/>
+        <cluster href="/api/clusters/a240aac1-d03a-4c69-923e-a295200539fa" id="a240aac1-d03a-4c69-923e-a295200539fa"/>
+        <positive>true</positive>
+        <enforcing>true</enforcing>
+    </affinity_group>
+    <affinity_group href="/api/clusters/a240aac1-d03a-4c69-923e-a295200539fa/affinitygroups/9aaec56b-e24d-4fce-82a1-21a7b642ab0f" id="9aaec56b-e24d-4fce-82a1-21a7b642ab0f">
+        <name>test1_ag</name>
+        <link href="/api/clusters/a240aac1-d03a-4c69-923e-a295200539fa/affinitygroups/9aaec56b-e24d-4fce-82a1-21a7b642ab0f/vms" rel="vms"/>
+        <cluster href="/api/clusters/a240aac1-d03a-4c69-923e-a295200539fa" id="a240aac1-d03a-4c69-923e-a295200539fa"/>
+        <positive>true</positive>
+        <enforcing>false</enforcing>
+    </affinity_group>
+</affinity_groups>

data/lib/fog/ovirt/requests/compute/remove_from_affinity_group.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Ovirt
+     class Real
+        def remove_from_affinity_group(id, options = {})
+          raise ArgumentError, "instance id is a required parameter" unless id
+          raise ArgumentError, "affinity group id is a required parameter for remove-from-affinity-group" unless options.key? :id
+          client.delete_vm_from_affinity_group(options[:id], id)
+        end
+      end
+
+      class Mock
+        def remove_from_affinity_group(id, options = {})
+          raise ArgumentError, "instance id is a required parameter" unless id
+          raise ArgumentError, "affinity group id is a required parameter for remove-from-affinity-group" unless options.key? :id
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/ovirt/requests/compute/update_interface.rb

@@ -1,19 +1,32 @@
 module Fog
   module Compute
     class Ovirt
-      class Real
-        def update_interface(id, options)
+
+      module Shared
+        def check_arguments(id, options)
           raise ArgumentError, "instance id is a required parameter" unless id
           raise ArgumentError, "interface id is a required parameter for update-interface" unless options.key? :id
+        end
+      end
+
+      class Real
+        extend ::Fog::Compute::Ovirt::Shared
 
-          client.update_interface(id, options)
+        def update_interface(id, options)
+          check_arguments(id, options)
+
+          interface_id = options[:id]
+          options.delete(:id)
+
+          client.update_interface(id, interface_id, options)
         end
       end
 
       class Mock
+        extend ::Fog::Compute::Ovirt::Shared
+
         def update_interface(id, options)
-          raise ArgumentError, "instance id is a required parameter" unless id
-          raise ArgumentError, "interface id is a required parameter for update-interface" unless options.key? :id
+          check_arguments(id, options)
           true
         end
       end

data/lib/fog/rackspace/docs/block_storage.md

@@ -414,4 +414,4 @@ Example code using Cloud Block Storage can be found [here](https://github.com/fo
 
 Your feedback is appreciated! If you have specific issues with the **fog** SDK, you should file an [issue via Github](https://github.com/fog/fog/issues).
 
-For general feedback and support requests, send an email to: <sdk-support@rackspace.com>.
+For general feedback and support requests, please visit: https://developer.rackspace.com/support.

data/lib/fog/rackspace/docs/cdn_v2.md

@@ -348,4 +348,4 @@ This returns a JSON blob that describes the home document.
 
 Your feedback is appreciated! If you have specific issues with the **fog** SDK, you should file an [issue via Github](https://github.com/fog/fog/issues).
 
-For general feedback and support requests, send an email to: <sdk-support@rackspace.com>.
+For general feedback and support requests, please visit: https://developer.rackspace.com/support.

data/lib/fog/rackspace/docs/compute_v2.md

@@ -715,5 +715,5 @@ Example code using Next Gen Cloud Servers can be found [here](https://github.com
 
 Your feedback is appreciated! If you have specific issues with the **fog** SDK, you should file an [issue via Github](https://github.com/fog/fog/issues).
 
-For general feedback and support requests, send an email to: <sdk-support@rackspace.com>.
+For general feedback and support requests, please visit: https://developer.rackspace.com/support.
 

data/lib/fog/rackspace/docs/getting_started.md

@@ -85,4 +85,4 @@ These services can be explored in further depth in the following documents:
 ## Support and Feedback
 Your feedback is appreciated! If you have specific issues with the **fog** SDK, you should file an [issue via Github](https://github.com/fog/fog/issues).
 
-For general feedback and support requests, send an email to: <sdk-support@rackspace.com>.
+For general feedback and support requests, please visit: https://developer.rackspace.com/support.

data/lib/fog/rackspace/docs/networking_v2.md

@@ -419,4 +419,4 @@ Example code using Networking can be found [here](https://github.com/fog/fog/tre
 
 Your feedback is appreciated! If you have specific issues with the **fog** SDK, you should file an [issue via Github](https://github.com/fog/fog/issues).
 
-For general feedback and support requests, send an email to: <sdk-support@rackspace.com>.
+For general feedback and support requests, please visit: https://developer.rackspace.com/support.

data/lib/fog/rackspace/docs/storage.md

@@ -554,4 +554,4 @@ Example code using Cloud Files can be found [here](https://github.com/fog/fog/tr
 
 Your feedback is appreciated! If you have specific issues with the **fog** SDK, you should file an [issue via Github](https://github.com/fog/fog/issues).
 
-For general feedback and support requests, send an email to: <sdk-support@rackspace.com>.
+For general feedback and support requests, please visit: https://developer.rackspace.com/support.

data/lib/fog/rackspace/examples/README.md

@@ -44,4 +44,4 @@ To execute scripts without `bundler`:
 
 Your feedback is appreciated! If you have specific issues with the **fog** SDK, developers should file an [issue via Github](https://github.com/fog/fog/issues).
 
-For general feedback and support requests, send an email to: <sdk-support@rackspace.com>.
+For general feedback and support requests, please visit: https://developer.rackspace.com/support.

data/lib/fog/rackspace/mock_data.rb

@@ -12,7 +12,7 @@ module Fog
             image_id   = Fog.credentials[:rackspace_image_id] ||= Fog::Rackspace::MockData.uuid
             image_name = Fog::Mock.random_letters(6)
             network_id = Fog::Rackspace::MockData.uuid
-            user_id    =  Fog::Mock.random_numbers(6).to_s
+            user_id    = Fog::Mock.random_numbers(6).to_s
 
             flavor = {
               "OS-FLV-EXT-DATA:ephemeral" => 4,
@@ -28,11 +28,11 @@ module Fog
                   "rel"  => "bookmark"
                 }
               ],
-                "name"        => "512MB Standard Instance",
-                "ram"         => 512,
-                "rxtx_factor" => 2.0,
-                "swap"        => 512,
-                "vcpus"       => 1,
+              "name"        => "512MB Standard Instance",
+              "ram"         => 512,
+              "rxtx_factor" => 2.0,
+              "swap"        => 512,
+              "vcpus"       => 1
             }
 
             image = {
@@ -55,7 +55,7 @@ module Fog
                   "type" => "application/vnd.openstack.image"
                 }
               ],
-                "metadata" => {
+              "metadata" => {
                 "arch" => "x86-64",
                 "auto_disk_config" => "True",
                 "com.rackspace__1__build_core" => "1",
@@ -89,11 +89,11 @@ module Fog
             }
 
             key_pair = {
-                'public_key'  => "ssh-rsa ".concat(Fog::Mock.random_letters(372)).concat(" Generated by Nova\n"),
-                'private_key' => "-----BEGIN RSA PRIVATE KEY-----\n".concat(Fog::Mock.random_letters(1635)).concat("\n-----END RSA PRIVATE KEY-----\n"),
-                'user_id'     => user_id,
-                'name'        => Fog::Mock.random_letters(32),
-                'fingerprint' => "00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00"
+              'public_key'  => "ssh-rsa ".concat(Fog::Mock.random_letters(372)).concat(" Generated by Nova\n"),
+              'private_key' => "-----BEGIN RSA PRIVATE KEY-----\n".concat(Fog::Mock.random_letters(1635)).concat("\n-----END RSA PRIVATE KEY-----\n"),
+              'user_id'     => user_id,
+              'name'        => Fog::Mock.random_letters(32),
+              'fingerprint' => "00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00"
             }
 
             #Block Storage
@@ -103,51 +103,51 @@ module Fog
             volume_type1 = {
               "id" => volume_type1_id,
               "name" => "SATA",
-              "extra_specs" => {},
+              "extra_specs" => {}
             }
 
             volume_type2 = {
               "id" => volume_type2_id,
               "name" => "SSD",
-              "extra_specs" => {},
+              "extra_specs" => {}
             }
 
             #AutoScale
             launch_config = {
               "args" => {
-                  "loadBalancers" => [
+                "loadBalancers" => [
+                  {
+                    "port" => 8080,
+                    "loadBalancerId" => 9099
+                  }
+                ],
+                "server" => {
+                  "name" => "autoscale_server",
+                  "imageRef" => "0d589460-f177-4b0f-81c1-8ab8903ac7d8",
+                  "flavorRef" => "2",
+                  "OS-DCF =>diskConfig" => "AUTO",
+                  "metadata" => {
+                    "build_config" => "core",
+                    "meta_key_1" => "meta_value_1",
+                    "meta_key_2" => "meta_value_2"
+                  },
+                  "networks" => [
+                    {
+                      "uuid" => "11111111-1111-1111-1111-111111111111"
+                    },
                     {
-                      "port" => 8080,
-                      "loadBalancerId" => 9099
+                      "uuid" => "00000000-0000-0000-0000-000000000000"
                     }
                   ],
-                  "server" => {
-                    "name" => "autoscale_server",
-                    "imageRef" => "0d589460-f177-4b0f-81c1-8ab8903ac7d8",
-                    "flavorRef" => "2",
-                    "OS-DCF =>diskConfig" => "AUTO",
-                    "metadata" => {
-                      "build_config" => "core",
-                      "meta_key_1" => "meta_value_1",
-                      "meta_key_2" => "meta_value_2"
-                    },
-                    "networks" => [
-                      {
-                        "uuid" => "11111111-1111-1111-1111-111111111111"
-                      },
-                      {
-                        "uuid" => "00000000-0000-0000-0000-000000000000"
-                      }
-                    ],
-                    "personality" => [
-                      {
-                        "path" => "/root/.csivh",
-                        "contents" => "VGhpcyBpcyBhIHRlc3QgZmlsZS4="
-                      }
-                    ]
-                  }
-                },
-                "type" => "launch_server"
+                  "personality" => [
+                    {
+                      "path" => "/root/.csivh",
+                      "contents" => "VGhpcyBpcyBhIHRlc3QgZmlsZS4="
+                    }
+                  ]
+                }
+              },
+              "type" => "launch_server"
             }
 
             group_config = {
@@ -204,11 +204,11 @@ module Fog
       end
 
       def self.uuid
-        [8,4,4,4,12].map{|i| Fog::Mock.random_hex(i)}.join("-")
+        [8,4,4,4,12].map { |i| Fog::Mock.random_hex(i) }.join("-")
       end
 
       def self.ipv4_address
-        4.times.map{ Fog::Mock.random_numbers(3) }.join(".")
+        4.times.map { Fog::Mock.random_numbers(3) }.join(".")
       end
 
       def self.ipv6_address
@@ -217,13 +217,13 @@ module Fog
 
       def self.keep(hash, *keys)
         {}.tap do |kept|
-          keys.each{|k| kept[k]= hash[k] if hash.key?(k)}
+          keys.each { |k| kept[k] = hash[k] if hash.key?(k) }
         end
       end
 
       def self.slice(hash, *keys)
         hash.dup.tap do |sliced|
-          keys.each{|k| sliced.delete(k)}
+          keys.each { |k| sliced.delete(k) }
         end
       end
 

data/lib/fog/rackspace/models/networking_v2/security_group.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Rackspace
+    class NetworkingV2
+      class SecurityGroup < Fog::Model
+
+        identity :id
+
+        attribute :name
+        attribute :description
+        attribute :tenant_id
+
+        def save
+          data = unless self.id.nil?
+            service.update_security_group(self)
+          else
+            service.create_security_group(self)
+          end
+
+          merge_attributes(data.body['security_group'])
+          true
+        end
+
+        def destroy
+          requires :identity
+
+          service.delete_security_group(identity)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/models/networking_v2/security_group_rule.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Rackspace
+    class NetworkingV2
+      class SecurityGroupRule < Fog::Model
+
+        identity :id
+
+        attribute :direction
+        attribute :ethertype
+        attribute :port_range_max
+        attribute :port_range_min
+        attribute :protocol
+        attribute :remote_group_id
+        attribute :remote_ip_prefix
+        attribute :security_group_id
+        attribute :tenant_id
+
+        def save
+          data = unless self.id.nil?
+            service.update_security_group_rule(self)
+          else
+            service.create_security_group_rule(self)
+          end
+
+          merge_attributes(data.body['security_group_rule'])
+          true
+        end
+
+        def destroy
+          requires :identity
+
+          service.delete_security_group_rule(identity)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/models/networking_v2/security_group_rules.rb

@@ -0,0 +1,23 @@
+require 'fog/rackspace/models/networking_v2/security_group_rule'
+
+module Fog
+  module Rackspace
+    class NetworkingV2
+      class SecurityGroupRules < Fog::Collection
+        model Fog::Rackspace::NetworkingV2::SecurityGroupRule
+
+        def all
+          data = service.list_security_group_rules.body['security_group_rules']
+          load(data)
+        end
+
+        def get(id)
+          data = service.show_security_group_rule(id).body['security_group_rule']
+          new(data)
+        rescue Fog::Rackspace::NetworkingV2::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/models/networking_v2/security_groups.rb

@@ -0,0 +1,23 @@
+require 'fog/rackspace/models/networking_v2/security_group'
+
+module Fog
+  module Rackspace
+    class NetworkingV2
+      class SecurityGroups < Fog::Collection
+        model Fog::Rackspace::NetworkingV2::SecurityGroup
+
+        def all
+          data = service.list_security_groups.body['security_groups']
+          load(data)
+        end
+
+        def get(id)
+          data = service.show_security_group(id).body['security_group']
+          new(data)
+        rescue Fog::Rackspace::NetworkingV2::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/networking_v2.rb

@@ -31,9 +31,9 @@ module Fog
       end
 
       class InvalidImageStateException < InvalidStateException
-         def to_s
-           "Image should have transitioned to '#{desired_state}' not '#{current_state}'"
-         end
+        def to_s
+          "Image should have transitioned to '#{desired_state}' not '#{current_state}'"
+        end
       end
 
       requires :rackspace_username, :rackspace_api_key
@@ -54,6 +54,12 @@ module Fog
       model :port
       collection :ports
 
+      model :security_group
+      collection :security_groups
+
+      model :security_group_rule
+      collection :security_group_rules
+
       request_path 'fog/rackspace/requests/networking_v2'
       request :list_networks
       request :create_network
@@ -73,6 +79,17 @@ module Fog
       request :update_port
       request :delete_port
 
+      request :list_security_groups
+      request :create_security_group
+      request :show_security_group
+      request :update_security_group
+      request :delete_security_group
+
+      request :list_security_group_rules
+      request :create_security_group_rule
+      request :show_security_group_rule
+      request :delete_security_group_rule
+
       class Mock < Fog::Rackspace::Service
         include Fog::Rackspace::MockData
 
@@ -128,10 +145,10 @@ module Fog
 
         def authenticate(options={})
           super({
-            :rackspace_api_key => @rackspace_api_key,
-            :rackspace_username => @rackspace_username,
-            :rackspace_auth_url => @rackspace_auth_url,
-            :connection_options => @connection_options
+                  :rackspace_api_key => @rackspace_api_key,
+                  :rackspace_username => @rackspace_username,
+                  :rackspace_auth_url => @rackspace_auth_url,
+                  :connection_options => @connection_options
           })
         end