fog-openstack 0.1.1 → 0.1.2

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

@@ -28,7 +28,7 @@ module Fog
           response = Excon::Response.new
           response.status = 201
           data = {
-            'id'                  => Fog::UUID.uuid,
+            'id'                  => floating_network_id,
             'floating_network_id' => floating_network_id,
             'port_id'             => options[:port_id],
             'tenant_id'           => options[:tenant_id],

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

@@ -0,0 +1,53 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def create_ike_policy(options = {})
+          data = {
+            'ikepolicy' => {
+            }
+          }
+
+          vanilla_options = [:name, :description, :tenant_id,
+                             :auth_algorithm, :encryption_algorithm,
+                             :pfs, :phase1_negotiation_mode,
+                             :lifetime, :ike_version
+                            ]
+          vanilla_options.reject { |o| options[o].nil? }.each do |key|
+            data['ikepolicy'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [201],
+            :method  => 'POST',
+            :path    => 'vpn/ikepolicies'
+          )
+        end
+      end
+
+      class Mock
+        def create_ike_policy(options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'                      => Fog::Mock.random_numbers(6).to_s,
+            'name'                    => options[:name],
+            'description'             => options[:description],
+            'tenant_id'               => options[:tenant_id],
+            'auth_algorithm'          => options[:auth_algorithm],
+            'encryption_algorithm'    => options[:encryption_algorithm],
+            'pfs'                     => options[:pfs],
+            'phase1_negotiation_mode' => options[:phase1_negotiation_mode],
+            'lifetime'                => options[:lifetime],
+            'ike_version'             => options[:ike_version]
+          }
+
+          self.data[:ike_policies][data['id']] = data
+          response.body = {'ikepolicy' => data}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def create_ipsec_policy(options = {})
+          data = {
+            'ipsecpolicy' => {
+            }
+          }
+
+          vanilla_options = [:name, :description, :tenant_id,
+                             :auth_algorithm, :encryption_algorithm,
+                             :pfs, :transform_protocol,
+                             :lifetime, :encapsulation_mode
+                            ]
+          vanilla_options.reject { |o| options[o].nil? }.each do |key|
+            data['ipsecpolicy'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [201],
+            :method  => 'POST',
+            :path    => 'vpn/ipsecpolicies'
+          )
+        end
+      end
+
+      class Mock
+        def create_ipsec_policy(options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'                   => Fog::Mock.random_numbers(6).to_s,
+            'name'                 => options[:name],
+            'description'          => options[:description],
+            'tenant_id'            => options[:tenant_id],
+            'auth_algorithm'       => options[:auth_algorithm],
+            'encryption_algorithm' => options[:encryption_algorithm],
+            'pfs'                  => options[:pfs],
+            'transform_protocol'   => options[:transform_protocol],
+            'lifetime'             => options[:lifetime],
+            'encapsulation_mode'   => options[:encapsulation_mode]
+          }
+
+          self.data[:ipsec_policies][data['id']] = data
+          response.body = {'ipsecpolicy' => data}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def create_ipsec_site_connection(vpn_service_id, ike_policy_id, ipsec_policy_id, options = {})
+          data = {
+            'ipsec_site_connection' => {
+              'vpnservice_id'  => vpn_service_id,
+              'ikepolicy_id'   => ike_policy_id,
+              'ipsecpolicy_id' => ipsec_policy_id
+            }
+          }
+
+          vanilla_options = [:name, :description, :tenant_id,
+                             :peer_address, :peer_id, :peer_cidrs,
+                             :psk, :mtu, :dpd, :initiator,
+                             :admin_state_up
+                            ]
+          vanilla_options.reject { |o| options[o].nil? }.each do |key|
+            data['ipsec_site_connection'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [201],
+            :method  => 'POST',
+            :path    => 'vpn/ipsec-site-connections'
+          )
+        end
+      end
+
+      class Mock
+        def create_ipsec_site_connection(vpn_service_id, ike_policy_id, ipsec_policy_id, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'                => Fog::Mock.random_numbers(6).to_s,
+            'name'              => options[:name],
+            'description'       => options[:description],
+            'status'            => 'ACTIVE',
+            'tenant_id'         => options[:tenant_id],
+            'admin_state_up'    => options[:admin_state_up],
+            'psk'               => options[:psk],
+            'initiator'         => options[:initiator],
+            'auth_mode'         => "psk",
+            'peer_cidrs'        => options[:peer_cidrs],
+            'mtu'               => options[:mtu],
+            'peer_ep_group_id'  => Fog::Mock.random_numbers(6).to_s,
+            'ikepolicy_id'      => ike_policy_id,
+            'vpnservice_id'     => vpn_service_id,
+            'dpd'               => options[:dpd],
+            'route_mode'        => "static",
+            'ipsecpolicy_id'    => ipsec_policy_id,
+            'local_ep_group_id' => Fog::Mock.random_numbers(6).to_s,
+            'peer_address'      => options[:peer_address],
+            'peer_id'           => options[:peer_id]
+          }
+
+          self.data[:ipsec_site_connections][data['id']] = data
+          response.body = {'ipsec_site_connection' => data}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def create_vpn_service(subnet_id, router_id, options = {})
+          data = {
+            'vpnservice' => {
+              'subnet_id' => subnet_id,
+              'router_id' => router_id
+            }
+          }
+
+          vanilla_options = [:name, :description, :admin_state_up, :tenant_id]
+          vanilla_options.reject { |o| options[o].nil? }.each do |key|
+            data['vpnservice'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [201],
+            :method  => 'POST',
+            :path    => 'vpn/vpnservices'
+          )
+        end
+      end
+
+      class Mock
+        def create_vpn_service(subnet_id, router_id, options = {})
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'             => Fog::Mock.random_numbers(6).to_s,
+            'subnet_id'      => subnet_id,
+            'router_id'      => router_id,
+            'name'           => options[:name],
+            'description'    => options[:description],
+            'status'         => 'ACTIVE',
+            'admin_state_up' => options[:admin_state_up],
+            'tenant_id'      => options[:tenant_id],
+            'external_v4_ip' => '1.2.3.4',
+            'external_v6_ip' => '::1'
+          }
+
+          self.data[:vpn_services][data['id']] = data
+          response.body = {'vpnservice' => data}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def delete_ike_policy(ike_policy_id)
+          request(
+            :expects => 204,
+            :method  => 'DELETE',
+            :path    => "vpn/ikepolicies/#{ike_policy_id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_ike_policy(ike_policy_id)
+          response = Excon::Response.new
+          if list_ike_policies.body['ikepolicies'].collect { |r| r['id'] }.include? ike_policy_id
+            data[:ike_policies].delete(ike_policy_id)
+            response.status = 204
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def delete_ipsec_policy(ipsec_policy_id)
+          request(
+            :expects => 204,
+            :method  => 'DELETE',
+            :path    => "vpn/ipsecpolicies/#{ipsec_policy_id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_ipsec_policy(ipsec_policy_id)
+          response = Excon::Response.new
+          if list_ipsec_policies.body['ipsecpolicies'].collect { |r| r['id'] }.include? ipsec_policy_id
+            data[:ipsec_policies].delete(ipsec_policy_id)
+            response.status = 204
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def delete_ipsec_site_connection(ipsec_site_connection_id)
+          request(
+            :expects => 204,
+            :method  => 'DELETE',
+            :path    => "vpn/ipsec-site-connections/#{ipsec_site_connection_id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_ipsec_site_connection(ipsec_site_connection_id)
+          response = Excon::Response.new
+          ip_site_connections = list_ipsec_site_connections.body['ipsec_site_connections']
+          if ip_site_connections.collect { |r| r['id'] }.include? ipsec_site_connection_id
+            data[:ipsec_site_connections].delete(ipsec_site_connection_id)
+            response.status = 204
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def delete_vpn_service(vpn_service_id)
+          request(
+            :expects => 204,
+            :method  => 'DELETE',
+            :path    => "vpn/vpnservices/#{vpn_service_id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_vpn_service(vpn_service_id)
+          response = Excon::Response.new
+          if list_vpn_services.body['vpnservices'].collect { |r| r['id'] }.include? vpn_service_id
+            data[:vpn_services].delete(vpn_service_id)
+            response.status = 204
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -25,16 +25,21 @@ module Fog
 
       class Mock
         def disassociate_floating_ip(floating_ip_id, options = {})
-          if data = self.data[:floating_ips][floating_ip_id]
-            response = Excon::Response.new
-            response.status = 201
-            data['port_id'] = nil
-            data['fixed_ip_address'] = nil
-            response.body = { 'floatingip' => data }
-            response
-          else
-            raise Fog::Network::OpenStack::NotFound
-          end
+          response = Excon::Response.new
+          response.status = 200
+          data = {
+            'id'                  => '00000000-0000-0000-0000-000000000000',
+            'router_id'           => nil,
+            'tenant_id'           => options["tenant_id"],
+            'floating_network_id' => options["floating_network_id"],
+            'fixed_ip_address'    => nil,
+            'floating_ip_address' => options["floating_ip_address"],
+            'port_id'             => options["port_id"],
+          }
+
+          self.data[:floating_ips][data['floating_ip_id']] = data
+          response.body = { 'floatingip' => data }
+          response
         end
       end
     end

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

@@ -14,10 +14,20 @@ module Fog
       class Mock
         def get_floating_ip(floating_ip_id)
           response = Excon::Response.new
-
           if data = self.data[:floating_ips][floating_ip_id]
             response.status = 200
-            response.body = { 'floatingip' => data }
+            response.body = {
+              "floatingip" => {
+                "id"                  => "00000000-0000-0000-0000-000000000000",
+                # changed
+                # "floating_ip_id" => floating_ip_id,
+                "port_id"             => data["port_id"],
+                "tenant_id"           => data["tenant_id"],
+                "fixed_ip_address"    => data["fixed_ip_address"],
+                "router_id"           => "00000000-0000-0000-0000-000000000000",
+                "floating_ip_address" => data["floating_ip_address"],
+              }
+            }
             response
           else
             raise Fog::Network::OpenStack::NotFound

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

@@ -0,0 +1,28 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def get_ike_policy(ike_policy_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "vpn/ikepolicies/#{ike_policy_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_ike_policy(ike_policy_id)
+          response = Excon::Response.new
+          if data = self.data[:ike_policies][ike_policy_id]
+            response.status = 200
+            response.body   = {'ikepolicy' => data}
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def get_ipsec_policy(ipsec_policy_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "vpn/ipsecpolicies/#{ipsec_policy_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_ipsec_policy(ipsec_policy_id)
+          response = Excon::Response.new
+          if data = self.data[:ipsec_policies][ipsec_policy_id]
+            response.status = 200
+            response.body   = {'ipsecpolicy' => data}
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end