fog-openstack 0.1.5 → 0.1.6

data/lib/fog/openstack/models/nfv/vnfs.rb

@@ -0,0 +1,28 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/nfv/vnf'
+
+module Fog
+  module NFV
+    class OpenStack
+      class Vnfs < Fog::OpenStack::Collection
+        model Fog::NFV::OpenStack::Vnf
+
+        def all(options = {})
+          load_response(service.list_vnfs(options), 'vnfs')
+        end
+
+        def get(uuid)
+          data = service.get_vnf(uuid).body['vnf']
+          new(data)
+        rescue Fog::NFV::OpenStack::NotFound
+          nil
+        end
+
+        def destroy(uuid)
+          vnf = get(uuid)
+          vnf.destroy
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume/snapshot.rb

@@ -0,0 +1,38 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Volume
+    class OpenStack
+      class Snapshot < Fog::OpenStack::Model
+        def update(data)
+          requires :id
+
+          response = service.update_snapshot(id, data)
+          merge_attributes(response.body['snapshot'])
+
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_snapshot(id)
+          true
+        end
+
+        # Existing keys have values updated and new key-value pairs are created, but none are deleted
+        def update_metadata(metadata)
+          requires :id
+          service.update_snapshot_metadata(id, metadata)
+          true
+        end
+
+        # Delete one specific key-value pair by specifying the key name
+        def delete_metadata(key_name)
+          requires :id
+          service.delete_snapshot_metadata(id, key_name)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume/snapshots.rb

@@ -0,0 +1,26 @@
+require 'fog/openstack/models/collection'
+
+module Fog
+  module Volume
+    class OpenStack
+      module Snapshots
+        def all(options = {})
+          load_response(service.list_snapshots_detailed(options), 'snapshots')
+        end
+
+        def summary(options = {})
+          load_response(service.list_snapshots(options), 'snapshots')
+        end
+
+        def get(snapshots_id)
+          snapshot = service.get_snapshot_details(snapshots_id).body['snapshot']
+          if snapshot
+            new(snapshot)
+          end
+        rescue Fog::Volume::OpenStack::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume/volume.rb

@@ -7,7 +7,7 @@ module Fog
         attribute :metadata
         attribute :status
         attribute :size
-        attribute :volume_type, :aliases => ['volumeType', 'type']
+        attribute :volume_type, :aliases => %w(volumeType type)
         attribute :snapshot_id, :aliases => 'snapshotId'
         attribute :imageRef, :aliases => 'image_id'
         attribute :availability_zone, :aliases => 'availabilityZone'
@@ -30,7 +30,37 @@ module Fog
         def ready?
           status == 'available'
         end
+
+        def reset_status(status)
+          requires :id
+          service.action(id, 'os-reset_status' => {:status => status})
+        end
+
+        def create_metadata(metadata)
+          replace_metadata(metadata)
+        end
+
+        # Existing keys have values updated and new key-value pairs are created, but none are deleted
+        def update_metadata(metadata)
+          requires :id
+          service.update_metadata(id, metadata)
+          true
+        end
+
+        # All existing key-value pairs are deleted and replaced with the key-value pairs specified here
+        def replace_metadata(metadata)
+          requires :id
+          service.replace_metadata(id, metadata)
+          true
+        end
+
+        # Delete one specific key-value pair by specifying the key name
+        def delete_metadata(key_name)
+          requires :id
+          service.delete_metadata(id, key_name)
+          true
+        end
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/volume/volume_type.rb

@@ -4,13 +4,12 @@ module Fog
   module Volume
     class OpenStack
       class VolumeType < Fog::OpenStack::Model
-
         attribute :extra_specs
 
         def create
           requires :name
 
-          response = service.create_volume_type(self.attributes)
+          response = service.create_volume_type(attributes)
           merge_attributes(response.body['volume_type'])
 
           self
@@ -19,7 +18,7 @@ module Fog
         def update
           requires :id
 
-          response = service.update_volume_type(self.id, self.attributes)
+          response = service.update_volume_type(id, attributes)
           merge_attributes(response.body['volume_type'])
 
           self
@@ -27,7 +26,7 @@ module Fog
 
         def destroy
           requires :id
-          service.delete_volume_type(self.id)
+          service.delete_volume_type(id)
           true
         end
       end

data/lib/fog/openstack/models/volume_v1/snapshot.rb

@@ -0,0 +1,43 @@
+require 'fog/openstack/models/volume/snapshot'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Snapshot < Fog::Volume::OpenStack::Snapshot
+          identity :id
+
+          attribute :display_name
+          attribute :status
+          attribute :display_description
+          attribute :metadata
+          attribute :force
+
+          def save
+            requires :display_name
+            data = if id.nil?
+                     service.create_snapshot(attributes[:volume_id], display_name, display_description, force)
+                   else
+                     service.update_snapshot(id, attributes.reject { |k, _v| k == :id })
+                   end
+            merge_attributes(data.body['snapshot'])
+            true
+          end
+
+          def create
+            requires :display_name
+
+            # volume_id, name, description, force=false
+            response = service.create_snapshot(attributes[:volume_id],
+                                               attributes[:display_name],
+                                               attributes[:display_description],
+                                               attributes[:force])
+            merge_attributes(response.body['snapshot'])
+
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v1/snapshots.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume_v1/snapshot'
+require 'fog/openstack/models/volume/snapshots'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1
+        class Snapshots < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V1::Snapshot
+          include Fog::Volume::OpenStack::Snapshots
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v1/volume.rb

@@ -7,18 +7,28 @@ module Fog
         class Volume < Fog::Volume::OpenStack::Volume
           identity :id
 
-          superclass.attributes.each{|attrib| attribute attrib}
+          superclass.attributes.each { |attrib| attribute attrib }
           attribute :display_name, :aliases => 'displayName'
           attribute :display_description, :aliases => 'displayDescription'
           attribute :tenant_id, :aliases => 'os-vol-tenant-attr:tenant_id'
 
           def save
             requires :display_name, :size
-            data = service.create_volume(display_name, display_description, size, attributes)
+            data = if id.nil?
+                     service.create_volume(display_name, display_description, size, attributes)
+                   else
+                     service.update_volume(id, attributes.reject { |k, _v| k == :id })
+                   end
             merge_attributes(data.body['volume'])
             true
           end
 
+          def update(attr = nil)
+            requires :id
+            merge_attributes(
+              service.update_volume(id, attr || attributes).body['volume'])
+            self
+          end
         end
       end
     end

data/lib/fog/openstack/models/volume_v2/snapshot.rb

@@ -0,0 +1,43 @@
+require 'fog/openstack/models/volume/snapshot'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Snapshot < Fog::Volume::OpenStack::Snapshot
+          identity :id
+
+          attribute :name
+          attribute :status
+          attribute :description
+          attribute :metadata
+          attribute :force
+
+          def save
+            requires :name
+            data = if id.nil?
+                     service.create_snapshot(attributes[:volume_id], name, description, force)
+                   else
+                     service.update_snapshot(id, attributes.reject { |k, _v| k == :id })
+                   end
+            merge_attributes(data.body['snapshot'])
+            true
+          end
+
+          def create
+            requires :name
+
+            # volume_id, name, description, force=false
+            response = service.create_snapshot(attributes[:volume_id],
+                                               attributes[:name],
+                                               attributes[:description],
+                                               attributes[:force])
+            merge_attributes(response.body['snapshot'])
+
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v2/snapshots.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/volume_v2/snapshot'
+require 'fog/openstack/models/volume/snapshots'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2
+        class Snapshots < Fog::OpenStack::Collection
+          model Fog::Volume::OpenStack::V2::Snapshot
+          include Fog::Volume::OpenStack::Snapshots
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume_v2/volume.rb

@@ -1,6 +1,5 @@
 require 'fog/openstack/models/volume/volume'
 
-
 module Fog
   module Volume
     class OpenStack
@@ -8,18 +7,28 @@ module Fog
         class Volume < Fog::Volume::OpenStack::Volume
           identity :id
 
-          superclass.attributes.each{|attrib| attribute attrib}
+          superclass.attributes.each { |attrib| attribute attrib }
           attribute :name
           attribute :description
           attribute :tenant_id, :aliases => 'os-vol-tenant-attr:tenant_id'
 
           def save
             requires :name, :size
-            data = service.create_volume(name, description, size, attributes)
+            data = if id.nil?
+                     service.create_volume(name, description, size, attributes)
+                   else
+                     service.update_volume(id, attributes.reject { |k, _v| k == :id })
+                   end
             merge_attributes(data.body['volume'])
             true
           end
 
+          def update(attr = nil)
+            requires :id
+            merge_attributes(
+              service.update_volume(id, attr || attributes).body['volume'])
+            self
+          end
         end
       end
     end

data/lib/fog/openstack/network.rb

@@ -11,7 +11,7 @@ module Fog
                  :openstack_tenant, :openstack_tenant_id,
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
-                 :openstack_endpoint_type,
+                 :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,
@@ -46,6 +46,8 @@ module Fog
       collection  :ipsec_policies
       model       :ipsec_site_connection
       collection  :ipsec_site_connections
+      model       :rbac_policy
+      collection  :rbac_policies
       model       :security_group
       collection  :security_groups
       model       :security_group_rule
@@ -152,6 +154,13 @@ module Fog
       request :get_ipsec_site_connection
       request :update_ipsec_site_connection
 
+      # RBAC Policy CRUD
+      request :list_rbac_policies
+      request :create_rbac_policy
+      request :delete_rbac_policy
+      request :get_rbac_policy
+      request :update_rbac_policy
+
       # Security Group
       request :create_security_group
       request :delete_security_group
@@ -181,7 +190,7 @@ module Fog
             tenant_id  = Fog::Mock.random_hex(8)
 
             hash[key] = {
-              :networks => {
+              :networks               => {
                 network_id                             => {
                   'id'                    => network_id,
                   'name'                  => 'Public',
@@ -203,8 +212,8 @@ module Fog
                   'tenant_id'      => 'f8b26a6032bc47718a7702233ac708b9',
                 }
               },
-              :ports => {},
-              :subnets => {
+              :ports                  => {},
+              :subnets                => {
                 subnet_id => {
                   'id'               => subnet_id,
                   'name'             => "Public",
@@ -219,35 +228,36 @@ module Fog
                   'tenant_id'        => tenant_id,
                 }
               },
-              :floating_ips => {},
-              :routers => {},
-              :lb_pools => {},
-              :lb_members => {},
-              :lb_health_monitors => {},
-              :lb_vips => {},
+              :floating_ips           => {},
+              :routers                => {},
+              :lb_pools               => {},
+              :lb_members             => {},
+              :lb_health_monitors     => {},
+              :lb_vips                => {},
               :vpn_services           => {},
               :ike_policies           => {},
               :ipsec_policies         => {},
               :ipsec_site_connections => {},
-              :quota => {
-                "subnet" => 10,
-                "router" => 10,
-                "port" => 50,
-                "network" => 10,
+              :rbac_policies          => {},
+              :quota                  => {
+                "subnet"     => 10,
+                "router"     => 10,
+                "port"       => 50,
+                "network"    => 10,
                 "floatingip" => 50
               },
-              :quotas => [
+              :quotas                 => [
                 {
-                  "subnet" => 10,
-                  "network" => 10,
+                  "subnet"     => 10,
+                  "network"    => 10,
                   "floatingip" => 50,
-                  "tenant_id" => tenant_id,
-                  "router" => 10,
-                  "port" => 30
+                  "tenant_id"  => tenant_id,
+                  "router"     => 10,
+                  "port"       => 30
                 }
               ],
-              :security_groups      => {},
-              :security_group_rules => {},
+              :security_groups        => {},
+              :security_group_rules   => {},
             }
           end
         end
@@ -258,7 +268,7 @@ module Fog
 
         include Fog::OpenStack::Core
 
-        def initialize(options={})
+        def initialize(options = {})
           @auth_token = Fog::Mock.random_base64(64)
           @auth_token_expiration = (Time.now.utc + 86400).iso8601
 
@@ -272,14 +282,12 @@ module Fog
         def reset_data
           self.class.data.delete("#{@openstack_username}-#{@openstack_tenant}")
         end
-
       end
 
       class Real
-
         include Fog::OpenStack::Core
 
-        def initialize(options={})
+        def initialize(options = {})
           initialize_identity options
 
           @openstack_service_type = options[:openstack_service_type] || ['network']
@@ -294,17 +302,16 @@ module Fog
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
-
         def request(params)
           begin
-            response = @connection.request(params.merge({
-              :headers  => {
-                'Content-Type' => 'application/json',
-                'Accept' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              }.merge!(params[:headers] || {}),
-              :path     => "#{@path}/#{params[:path]}"#,
-            }))
+            response = @connection.request(params.merge(
+                                             :headers => {
+                                               'Content-Type' => 'application/json',
+                                               'Accept'       => 'application/json',
+                                               'X-Auth-Token' => @auth_token
+                                             }.merge!(params[:headers] || {}),
+                                             :path    => "#{@path}/#{params[:path]}" # ,
+            ))
           rescue Excon::Errors::Unauthorized => error
             if error.response.body != 'Bad username or password' # token expiration
               @openstack_must_reauthenticate = true
@@ -316,11 +323,11 @@ module Fog
             end
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
-            when Excon::Errors::NotFound
-              Fog::Network::OpenStack::NotFound.slurp(error)
-            else
-              error
-            end
+                  when Excon::Errors::NotFound
+                    Fog::Network::OpenStack::NotFound.slurp(error)
+                  else
+                    error
+                  end
           end
           unless response.body.empty?
             response.body = Fog::JSON.decode(response.body)
@@ -329,12 +336,12 @@ module Fog
         end
 
         def set_api_path
-          @path.sub!(/\/$/, '')
+          @path.sub!(%r{\/$}, '')
           unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
-                                                               @openstack_management_uri,
-                                                               @auth_token,
-                                                               @connection_options)
+            @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
+                                                              @openstack_management_uri,
+                                                              @auth_token,
+                                                              @connection_options)
           end
         end
       end