fog-openstack 0.1.15 → 0.1.17

data/lib/fog/network/openstack.rb

@@ -220,17 +220,20 @@ module Fog
                   'router:external'       => false,
                   'admin_state_up'        => true,
                   'qos_policy_id'         => qos_policy_id,
-                  'port_security_enabled' => 'port_security_enabled'
+                  'port_security_enabled' => true
                 },
                 'e624a36d-762b-481f-9b50-4154ceb78bbb' => {
-                  'id'              => 'e624a36d-762b-481f-9b50-4154ceb78bbb',
-                  'name'            => 'network_1',
-                  'subnets'         => ['2e4ec6a4-0150-47f5-8523-e899ac03026e'],
-                  'shared'          => false,
-                  'status'          => 'ACTIVE',
-                  'admin_state_up'  => true,
-                  'tenant_id'       => 'f8b26a6032bc47718a7702233ac708b9',
-                  'router:external' => false,
+                  'id'                    => 'e624a36d-762b-481f-9b50-4154ceb78bbb',
+                  'name'                  => 'network_1',
+                  'subnets'               => ['2e4ec6a4-0150-47f5-8523-e899ac03026e'],
+                  'shared'                => false,
+                  'status'                => 'ACTIVE',
+                  'tenant_id'             => 'f8b26a6032bc47718a7702233ac708b9',
+                  'provider:network:type' => 'vlan',
+                  'router:external'       => false,
+                  'admin_state_up'        => true,
+                  'qos_policy_id'         => qos_policy_id,
+                  'port_security_enabled' => true
                 }
               },
               :ports                  => {},

data/lib/fog/network/openstack/models/rbac_policy.rb

@@ -7,7 +7,6 @@ module Fog
         identity :id
 
         attribute :object_type
-        attribute :object_id
         attribute :tenant_id
         attribute :target_tenant
         attribute :action

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

@@ -9,7 +9,7 @@ module Fog
             }
           }
 
-          vanilla_options = [:port_id, :tenant_id, :fixed_ip_address]
+          vanilla_options = [:port_id, :tenant_id, :fixed_ip_address, :floating_ip_address]
           vanilla_options.reject { |o| options[o].nil? }.each do |key|
             data['floatingip'][key] = options[key]
           end

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

@@ -69,13 +69,13 @@ module Fog
           data = {
             'id'                    => Fog::Mock.random_numbers(6).to_s,
             'name'                  => options[:name],
-            'shared'                => options[:shared],
+            'shared'                => options[:shared] || false,
             'subnets'               => [],
             'status'                => 'ACTIVE',
-            'admin_state_up'        => options[:admin_state_up],
+            'admin_state_up'        => options[:admin_state_up] || false,
             'tenant_id'             => options[:tenant_id],
             'qos_policy_id'         => options[:qos_policy_id],
-            'port_security_enabled' => options[:port_security_enabled]
+            'port_security_enabled' => options[:port_security_enabled] || false
           }
           data.merge!(Fog::Network::OpenStack::Real.create(options))
           self.data[:networks][data['id']] = data

data/lib/fog/openstack.rb

@@ -51,6 +51,10 @@ module Fog
     autoload :OpenStack, File.expand_path('../metering/openstack', __FILE__)
   end
 
+  module Metric
+    autoload :OpenStack, File.expand_path('../metric/openstack', __FILE__)
+  end
+
   module Monitoring
     autoload :OpenStack, File.expand_path('../monitoring/openstack', __FILE__)
   end
@@ -67,6 +71,10 @@ module Fog
     autoload :OpenStack, File.expand_path('../orchestration/openstack', __FILE__)
   end
 
+  module SharedFileSystem
+    autoload :OpenStack, File.expand_path('../shared_file_system/openstack', __FILE__)
+  end
+
   module Storage
     autoload :OpenStack, File.expand_path('../storage/openstack', __FILE__)
   end
@@ -91,21 +99,23 @@ module Fog
   module OpenStack
     extend Fog::Provider
 
-    service(:compute,       'Compute')
-    service(:image,         'Image')
-    service(:identity,      'Identity')
-    service(:network,       'Network')
-    service(:storage,       'Storage')
-    service(:volume,        'Volume')
-    service(:metering,      'Metering')
-    service(:orchestration, 'Orchestration')
-    service(:nfv,           'NFV')
-    service(:baremetal,     'Baremetal')
-    service(:planning,      'Planning')
-    service(:introspection, 'Introspection')
-    service(:monitoring,    'Monitoring')
-    service(:workflow,      'Workflow')
-    service(:dns,           'DNS')
+    service(:compute,            'Compute')
+    service(:image,              'Image')
+    service(:identity,           'Identity')
+    service(:network,            'Network')
+    service(:storage,            'Storage')
+    service(:volume,             'Volume')
+    service(:metering,           'Metering')
+    service(:metric,             'Metric')
+    service(:orchestration,      'Orchestration')
+    service(:nfv,                'NFV')
+    service(:baremetal,          'Baremetal')
+    service(:planning,           'Planning')
+    service(:introspection,      'Introspection')
+    service(:monitoring,         'Monitoring')
+    service(:workflow,           'Workflow')
+    service(:dns,                'DNS')
+    service(:shared_file_system, 'SharedFileSystem')
 
     @token_cache = {}
 

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Openstack
-    VERSION = "0.1.15"
+    VERSION = "0.1.17"
   end
 end

data/lib/fog/orchestration/openstack/models/stack.rb

@@ -14,7 +14,11 @@ module Fog
 
         def save(options = {})
           if persisted?
-            service.update_stack(self, default_options.merge(options)).body['stack']
+            stack_default_options = default_options
+            if (options.key?(:template_url))
+              stack_default_options.delete(:template)
+            end
+            service.update_stack(self, stack_default_options.merge(options)).body['stack']
           else
             service.stacks.create(default_options.merge(options))
           end

data/lib/fog/shared_file_system/openstack.rb

@@ -0,0 +1,278 @@
+module Fog
+  module SharedFileSystem
+    class OpenStack < Fog::Service
+      SUPPORTED_VERSIONS = /v2(\.0)*/
+
+      requires :openstack_auth_url
+      recognizes :openstack_auth_token, :openstack_management_url,
+                 :persistent, :openstack_service_type, :openstack_service_name,
+                 :openstack_tenant, :openstack_tenant_id,
+                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
+                 :current_user, :current_tenant, :openstack_region,
+                 :openstack_endpoint_type, :openstack_cache_ttl,
+                 :openstack_project_name, :openstack_project_id,
+                 :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
+                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
+                 :openstack_identity_prefix
+
+      model_path 'fog/shared_file_system/openstack/models'
+      model       :network
+      collection  :networks
+      model       :share
+      collection  :shares
+      model       :snapshot
+      collection  :snapshots
+
+      request_path 'fog/shared_file_system/openstack/requests'
+      # share networks
+      request :list_share_networks
+      request :list_share_networks_detail
+      request :get_share_network
+      request :create_share_network
+      request :update_share_network
+      request :delete_share_network
+
+      # shares
+      request :list_shares
+      request :list_shares_detail
+      request :get_share
+      request :create_share
+      request :update_share
+      request :delete_share
+
+      # snapshots
+      request :list_snapshots
+      request :list_snapshots_detail
+      request :get_snapshot
+      request :create_snapshot
+      request :update_snapshot
+      request :delete_snapshot
+
+      # rubocop:disable LineLength, Metrics/MethodLength, Metrics/ClassLength, Metrics/AbcSize
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :shares                => [
+                {
+                  "id"    => "d94a8548-2079-4be0-b21c-0a887acd31ca",
+                  "links" => [
+                    {
+                      "href" => "http://172.18.198.54:8786/v1/16e1ab15c35a457e9c2b2aa189f544e1/shares/d94a8548-2079-4be0-b21c-0a887acd31ca",
+                      "rel"  => "self"
+                    },
+                    {
+                      "href" => "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/shares/d94a8548-2079-4be0-b21c-0a887acd31ca",
+                      "rel"  => "bookmark"
+                    }
+                  ],
+                  "name"  => "My_share"
+                },
+                {
+                  "id"    => "406ea93b-32e9-4907-a117-148b3945749f",
+                  "links" => [
+                    {
+                      "href" => "http://172.18.198.54:8786/v1/16e1ab15c35a457e9c2b2aa189f544e1/shares/406ea93b-32e9-4907-a117-148b3945749f",
+                      "rel"  => "self"
+                    },
+                    {
+                      "href" => "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/shares/406ea93b-32e9-4907-a117-148b3945749f",
+                      "rel"  => "bookmark"
+                    }
+                  ],
+                  "name"  => "Share1"
+                }
+              ],
+              :shares_detail         => [
+                {
+                  "links"                       => [
+                    {
+                      "href" => "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/shares/f45cc5b2-d1bb-4a3e-ba5b-5c4125613adc",
+                      "rel"  => "self"
+                    },
+                    {
+                      "href" => "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/shares/f45cc5b2-d1bb-4a3e-ba5b-5c4125613adc",
+                      "rel"  => "bookmark"
+                    }
+                  ],
+                  "availability_zone"           => "nova",
+                  "share_network_id"            => "f9b2e754-ac01-4466-86e1-5c569424754e",
+                  "export_locations"            => [],
+                  "share_server_id"             => "87d8943a-f5da-47a4-b2f2-ddfa6794aa82",
+                  "snapshot_id"                 => '',
+                  "id"                          => "f45cc5b2-d1bb-4a3e-ba5b-5c4125613adc",
+                  "size"                        => 1,
+                  "share_type"                  => "25747776-08e5-494f-ab40-a64b9d20d8f7",
+                  "share_type_name"             => "default",
+                  "export_location"             => '',
+                  "consistency_group_id"        => "9397c191-8427-4661-a2e8-b23820dc01d4",
+                  "project_id"                  => "16e1ab15c35a457e9c2b2aa189f544e1",
+                  "metadata"                    => {},
+                  "status"                      => "available",
+                  "access_rules_status"         => "active",
+                  "description"                 => "There is a share description.",
+                  "host"                        => "manila2@generic1#GENERIC1",
+                  "task_state"                  => '',
+                  "is_public"                   => 'true',
+                  "snapshot_support"            => 'true',
+                  "name"                        => "my_share4",
+                  "has_replicas"                => 'false',
+                  "replication_type"            => '',
+                  "created_at"                  => "2015-09-16T18:19:50.000000",
+                  "share_proto"                 => "NFS",
+                  "volume_type"                 => "default",
+                  "source_cgsnapshot_member_id" => ''
+                }
+              ],
+              :share_networks        => [
+                {
+                  "id"   => "32763294-e3d4-456a-998d-60047677c2fb",
+                  "name" => "net_my1"
+                },
+                {
+                  "id"   => "713df749-aac0-4a54-af52-10f6c991e80c",
+                  "name" => "net_my"
+                }
+              ],
+              :share_networks_detail => [
+                {
+                  "name"              => "net_my1",
+                  "segmentation_id"   => '',
+                  "created_at"        => "2015-09-04T14:57:13.000000",
+                  "neutron_subnet_id" => "53482b62-2c84-4a53-b6ab-30d9d9800d06",
+                  "updated_at"        => '',
+                  "id"                => "32763294-e3d4-456a-998d-60047677c2fb",
+                  "neutron_net_id"    => "998b42ee-2cee-4d36-8b95-67b5ca1f2109",
+                  "ip_version"        => '',
+                  "nova_net_id"       => '',
+                  "cidr"              => '',
+                  "project_id"        => "16e1ab15c35a457e9c2b2aa189f544e1",
+                  "network_type"      => '',
+                  "description"       => "descr"
+                }
+              ],
+              :snapshots             => [
+                {
+                  "id"    => "086a1aa6-c425-4ecd-9612-391a3b1b9375",
+                  "links" => [
+                    {
+                      "href" => "http://172.18.198.54:8786/v1/16e1ab15c35a457e9c2b2aa189f544e1/snapshots/086a1aa6-c425-4ecd-9612-391a3b1b9375",
+                      "rel"  => "self"
+                    },
+                    {
+                      "href" => "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/snapshots/086a1aa6-c425-4ecd-9612-391a3b1b9375",
+                      "rel"  => "bookmark"
+                    }
+                  ],
+                  "name"  => "snapshot_My_share"
+                }
+              ],
+              :snapshots_detail      => [
+                {
+                  "status"      => "available",
+                  "share_id"    => "d94a8548-2079-4be0-b21c-0a887acd31ca",
+                  "name"        => "snapshot_My_share",
+                  "links"       => [
+                    {
+                      "href" => "http://172.18.198.54:8786/v1/16e1ab15c35a457e9c2b2aa189f544e1/snapshots/086a1aa6-c425-4ecd-9612-391a3b1b9375",
+                      "rel"  => "self"
+                    },
+                    {
+                      "href" => "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/snapshots/086a1aa6-c425-4ecd-9612-391a3b1b9375",
+                      "rel"  => "bookmark"
+                    }
+                  ],
+                  "created_at"  => "2015-09-07T11:55:09.000000",
+                  "description" => "Here is a snapshot of share My_share",
+                  "share_proto" => "NFS",
+                  "share_size"  => 1,
+                  "id"          => "086a1aa6-c425-4ecd-9612-391a3b1b9375",
+                  "size"        => 1
+                }
+              ]
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options = {})
+          @openstack_username = options[:openstack_username]
+          @openstack_tenant   = options[:openstack_tenant]
+          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+          @auth_token = Fog::Mock.random_base64(64)
+          @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+          management_url = URI.parse(options[:openstack_auth_url])
+          management_url.port = 8786
+          management_url.path = '/v2'
+          @openstack_management_url = management_url.to_s
+
+          @data ||= {:users => {}}
+          unless @data[:users].detect { |u| u['name'] == options[:openstack_username] }
+            id = Fog::Mock.random_numbers(6).to_s
+            @data[:users][id] = {
+              'id'       => id,
+              'name'     => options[:openstack_username],
+              'email'    => "#{options[:openstack_username]}@mock.com",
+              'tenantId' => Fog::Mock.random_numbers(6).to_s,
+              'enabled'  => true
+            }
+          end
+        end
+
+        def data
+          self.class.data[@openstack_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@openstack_username)
+        end
+
+        def credentials
+          {:provider                 => 'openstack',
+           :openstack_auth_url       => @openstack_auth_uri.to_s,
+           :openstack_auth_token     => @auth_token,
+           :openstack_region         => @openstack_region,
+           :openstack_management_url => @openstack_management_url}
+        end
+      end
+      # rubocop:enable LineLength, Metrics/MethodLength, Metrics/ClassLength, Metrics/AbcSize
+
+      class Real
+        include Fog::OpenStack::Core
+
+        def self.not_found_class
+          Fog::SharedFileSystem::OpenStack::NotFound
+        end
+
+        def initialize(options = {})
+          initialize_identity options
+
+          @openstack_service_type           = options[:openstack_service_type] || ['sharev2']
+          @openstack_service_name           = options[:openstack_service_name]
+
+          @connection_options               = options[:connection_options] || {}
+
+          authenticate
+          set_api_path
+
+          @persistent = options[:persistent] || false
+          @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+        end
+
+        def set_api_path
+          unless @path.match(SUPPORTED_VERSIONS)
+            @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
+                                                              @openstack_management_uri,
+                                                              @auth_token,
+                                                              @connection_options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/shared_file_system/openstack/models/network.rb

@@ -0,0 +1,42 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module SharedFileSystem
+    class OpenStack
+      class Network < Fog::OpenStack::Model
+        identity :id
+
+        attribute :name
+        attribute :description
+        attribute :neutron_net_id
+        attribute :neutron_subnet_id
+        attribute :nova_net_id
+        attribute :network_type
+        attribute :segmentation_id
+        attribute :cidr
+        attribute :ip_version
+        attribute :project_id
+        attribute :created_at
+        attribute :updated_at
+
+        def save
+          raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted?
+          merge_attributes(service.create_share_network(attributes).body['share_network'])
+          true
+        end
+
+        def update(options = nil)
+          requires :id
+          merge_attributes(service.update_share_network(id, options || attributes).body['share_network'])
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_share_network(id)
+          true
+        end
+      end
+    end
+  end
+end