fog 1.6.0 → 1.7.0

data/lib/fog/openstack/requests/network/get_port.rb

@@ -0,0 +1,48 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def get_port(port_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "ports/#{port_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_port(port_id)
+          response = Excon::Response.new
+          if data = self.data[:ports][port_id]
+            response.status = 200
+            response.body = {
+              'port' => {
+                'id' => '5c81d975-5fea-4674-9c1f-b8aa10bf9a79',
+                'name' => 'port_1',
+                'network_id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb',
+                'fixed_ips' => [
+                  {
+                    'ip_address' => '10.2.2.2',
+                    'subnet_id' => '2e4ec6a4-0150-47f5-8523-e899ac03026e',
+                  }
+                ],
+                'mac_address' => 'fa:16:3e:62:91:7f',
+                'status' => 'ACTIVE',
+                'admin_state_up' => true,
+                'device_id' => 'dhcp724fc160-2b2e-597e-b9ed-7f65313cd73f-e624a36d-762b-481f-9b50-4154ceb78bbb',
+                'device_owner' => 'network:dhcp',
+                'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9',
+              }
+            }
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/get_subnet.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def get_subnet(subnet_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "subnets/#{subnet_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_subnet(subnet_id)
+          response = Excon::Response.new
+          if data = self.data[:subnets][subnet_id]
+            response.status = 200
+            response.body = {
+              "subnet" => {
+                "id" => "2e4ec6a4-0150-47f5-8523-e899ac03026e",
+                "name" => "subnet_1",
+                "network_id" => "e624a36d-762b-481f-9b50-4154ceb78bbb",
+                "cidr" => "10.2.2.0/24",
+                "ip_version" => 4,
+                "gateway_ip" => "10.2.2.1",
+                "allocation_pools" => [
+                  {
+                    "start" => "10.2.2.2",
+                    "end" => "10.2.2.254"
+                  }
+                ],
+                "dns_nameservers" => [],
+                "host_routes" => [],
+                "enable_dhcp" => true,
+                "tenant_id" => "f8b26a6032bc47718a7702233ac708b9",
+              }
+            }
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/list_networks.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def list_networks(filters = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'networks',
+            :query   => filters
+          )
+        end
+      end
+
+      class Mock
+        def list_networks(filters = {})
+          Excon::Response.new(
+            :body   => { 'networks' => self.data[:networks].values },
+            :status => 200
+          )
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/list_ports.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def list_ports(filters = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'ports',
+            :query   => filters
+          )
+        end
+      end
+
+      class Mock
+        def list_ports(filters = {})
+          Excon::Response.new(
+            :body   => { 'ports' => self.data[:ports].values },
+            :status => 200
+          )
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/list_subnets.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def list_subnets(filters = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'subnets',
+            :query   => filters
+          )
+        end
+      end
+
+      class Mock
+        def list_subnets(filters = {})
+          Excon::Response.new(
+            :body   => { 'subnets' => self.data[:subnets].values },
+            :status => 200
+          )
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/set_tenant.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def set_tenant(tenant)
+          @openstack_must_reauthenticate = true
+          @openstack_tenant = tenant.to_s
+          authenticate
+        end
+      end
+
+      class Mock
+        def set_tenant(tenant)
+          true
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/update_network.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def update_network(network_id, options = {})
+          data = { 'network' => {} }
+
+          vanilla_options = [:name, :shared, :admin_state_up]
+          vanilla_options.select{ |o| options.has_key?(o) }.each do |key|
+            data['network'][key] = options[key]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => 200,
+            :method   => 'PUT',
+            :path     => "networks/#{network_id}.json"
+          )
+        end
+      end
+
+      class Mock
+        def update_network(network_id, options = {})
+          response = Excon::Response.new
+          if network = list_networks.body['networks'].detect { |_| _['id'] == network_id }
+            network['name']           = options[:name]
+            network['shared']         = options[:shared]
+            network['admin_state_up'] = options[:admin_state_up]
+            response.body = { 'network' => network }
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/update_port.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def update_port(port_id, options = {})
+          data = { 'port' => {} }
+
+          vanilla_options = [:name, :fixed_ips, :admin_state_up, :device_owner,
+                             :device_id]
+          vanilla_options.select{ |o| options.has_key?(o) }.each do |key|
+            data['port'][key] = options[key]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => 200,
+            :method   => 'PUT',
+            :path     => "ports/#{port_id}.json"
+          )
+        end
+      end
+
+      class Mock
+        def update_port(port_id, options = {})
+          response = Excon::Response.new
+          if port = list_ports.body['ports'].detect { |_| _['id'] == port_id }
+            port['name']           = options[:name]
+            port['fixed_ips']      = options[:fixed_ips]
+            port['admin_state_up'] = options[:admin_state_up]
+            port['device_owner']   = options[:device_owner]
+            port['device_id']      = options[:device_id]
+            response.body = { 'port' => port }
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/update_subnet.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def update_subnet(subnet_id, options = {})
+          data = { 'subnet' => {} }
+
+          vanilla_options = [:name, :gateway_ip, :dns_nameservers,
+                             :host_routes, :enable_dhcp]
+          vanilla_options.select{ |o| options.has_key?(o) }.each do |key|
+            data['subnet'][key] = options[key]
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => 200,
+            :method   => 'PUT',
+            :path     => "subnets/#{subnet_id}"
+          )
+        end
+      end
+
+      class Mock
+        def update_subnet(subnet_id, options = {})
+          response = Excon::Response.new
+          if subnet = list_subnets.body['subnets'].detect { |_| _['id'] == subnet_id }
+            subnet['name']            = options[:name]
+            subnet['gateway_ip']      = options[:gateway_ip]
+            subnet['dns_nameservers'] = options[:dns_nameservers]
+            subnet['host_routes']     = options[:host_routes]
+            subnet['enable_dhcp']     = options[:enable_dhcp]
+            response.body = { 'subnet' => subnet }
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/volume/create_volume.rb

@@ -33,16 +33,16 @@ module Fog
           response.status = 202
           response.body = {
             'volume' => {
-              'id'                 => Fog::Mock.random_numbers(2),
-              'displayName'        => name,
-              'displayDescription' => description,
-              'size'               => size,
-              'status'             => 'creating',
-              'snapshotId'         => '4',
-              'volumeType'         => nil,
-              'availabilityZone'   => 'nova',
-              'createdAt'          => Time.now,
-              'attchments'         => []
+              'id'                  => Fog::Mock.random_numbers(2),
+              'display_name'        => name,
+              'display_description' => description,
+              'size'                => size,
+              'status'              => 'creating',
+              'snapshot_id'         => options["snapshot_id"] || nil,
+              'volume_type'         => nil,
+              'availability_zone'   => 'nova',
+              'created_at'          => Time.now,
+              'attachments'         => []
             }
           }
           response

data/lib/fog/openstack/requests/volume/create_volume_snapshot.rb

@@ -24,7 +24,22 @@ module Fog
       end
 
       class Mock
-
+        def create_volume_snapshot(volume_id, name, description, force=false)
+          response = Excon::Response.new
+          response.status = 202
+          response.body = {
+            "snapshot"=> {
+               "status"=>"creating",
+               "display_name"=>name,
+               "created_at"=>Time.now,
+               "display_description"=>description,
+               "volume_id"=>volume_id,
+               "id"=>"5",
+               "size"=>1
+            }
+          }
+          response
+        end
       end
 
     end

data/lib/fog/openstack/requests/volume/get_snapshot_details.rb

@@ -22,12 +22,12 @@ module Fog
           response.body = {
             'snapshot' => {
               'id'                 => '1',
-              'displayName'        => Fog::Mock.random_letters(rand(8) + 5),
-              'displayDescription' => Fog::Mock.random_letters(rand(12) + 10),
-              'size'               => 3,
-              'volumeId'           => '4',
-              'status'             => 'online',
-              'createdAt'          => Time.now
+              'display_name'        => 'Snapshot1',
+              'display_description' => 'Volume1 snapshot',
+              'size'               => 1,
+              'volume_id'           => '1',
+              'status'             => 'available',
+              'created_at'          => Time.now
             }
           }
           response

data/lib/fog/openstack/requests/volume/get_volume_details.rb

@@ -21,16 +21,16 @@ module Fog
           response.status = 200
           response.body = {
             'volume' => {
-              'id'                 => '1',
-              'displayName'        => Fog::Mock.random_letters(rand(8) + 5),
-              'displayDescription' => Fog::Mock.random_letters(rand(12) + 10),
-              'size'               => 3,
-              'volumeType'         => nil,
-              'snapshotId'         => '4',
-              'status'             => 'online',
-              'availabilityZone'   => 'nova',
-              'createdAt'          => Time.now,
-              'attchments'         => []
+              'id'                  => '1',
+              'display_name'        => Fog::Mock.random_letters(rand(8) + 5),
+              'display_description' => Fog::Mock.random_letters(rand(12) + 10),
+              'size'                => 3,
+              'volume_type'         => nil,
+              'snapshot_id'         => '4',
+              'status'              => 'online',
+              'availability_zone'   => 'nova',
+              'created_at'          => Time.now,
+              'attachments'         => []
             }
           }
           response

data/lib/fog/openstack/requests/volume/list_volumes.rb

@@ -22,26 +22,26 @@ module Fog
           response.status = 200
           self.data[:volumes] ||= [
             { "status" => "available",
-              "displayDescription" => "",
-              "availabilityZone" => "nova",
-              "displayName" => "test 1",
+              "display_description" => "test 1 desc",
+              "availability_zone" => "nova",
+              "display_name" => "Volume1",
               "attachments" => [{}],
-              "volumeType" => nil,
-              "snapshotId" => nil,
+              "volume_type" => nil,
+              "snapshot_id" => nil,
               "size" => 1,
-              "id" => 6,
-              "createdAt" => "2012-03-30 05:31:00.655058",
+              "id" => 1,
+              "created_at" => Time.now,
               "metadata" => {} },
             { "status" => "available",
-              "displayDescription" => "",
-              "availabilityZone" => "nova",
-              "displayName" => "test 2",
+              "display_description" => "test 2 desc",
+              "availability_zone" => "nova",
+              "display_name" => "Volume2",
               "attachments" => [{}],
-              "volumeType" => nil,
-              "snapshotId" => nil,
+              "volume_type" => nil,
+              "snapshot_id" => nil,
               "size" => 1,
-              "id" => 8,
-              "createdAt" => "2012-03-30 16:14:55.582717",
+              "id" => 2,
+              "created_at" => Time.now,
               "metadata" => {} }
             ]
           response.body = { 'volumes' => self.data[:volumes] }