fog-openstack 0.1.5 → 0.1.6

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

@@ -7,16 +7,16 @@ module Fog
       class Snapshot < Fog::OpenStack::Model
         identity :id
 
-        attribute :name,                :aliases => 'displayName'
-        attribute :description,         :aliases => 'displayDescription'
-        attribute :volume_id,           :aliases => 'volumeId'
+        attribute :name,        :aliases => 'displayName'
+        attribute :description, :aliases => 'displayDescription'
+        attribute :volume_id,   :aliases => 'volumeId'
+        attribute :created_at,  :aliases => 'createdAt'
         attribute :status
         attribute :size
-        attribute :created_at,          :aliases => 'createdAt'
 
-        def save(force=false)
+        def save(force = false)
           requires :volume_id, :name, :description
-          data = service.create_volume_snapshot(volume_id, name, description, force)
+          data = service.create_snapshot(volume_id, name, description, force)
           merge_attributes(data.body['snapshot'])
           true
         end

data/lib/fog/openstack/models/compute/volume_attachment.rb

@@ -0,0 +1,15 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class OpenStack
+      class VolumeAttachment < Fog::Model
+        identity :id
+
+        attribute :serverId
+        attribute :volumeId
+        attribute :device
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/compute/volume_attachments.rb

@@ -0,0 +1,20 @@
+require 'fog/core/collection'
+
+module Fog
+  module Compute
+    class OpenStack
+      class VolumeAttachments < Fog::Collection
+        model Fog::Compute::OpenStack::VolumeAttachment
+
+        def get(server_id)
+          if server_id
+            puts service.list_volume_attachments(server_id).body
+            load(service.list_volume_attachments(server_id).body['volumeAttachments'])
+          end
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/identity_v3/projects.rb

@@ -54,7 +54,7 @@ module Fog
 
             if service.openstack_cache_ttl > 0
               @@cache[{:token => service.auth_token, :id => id, :options => options}] = [
-                top_project, Time.now + service.openstack_cache_tt]
+                top_project, Time.now + service.openstack_cache_ttl]
             end
             return top_project
           end

data/lib/fog/openstack/models/identity_v3/users.rb

@@ -20,8 +20,8 @@ module Fog
                 user_hash.merge(:service => service))
           end
 
-          def find_by_name(name)
-            load(service.list_users(:name => name).body['users'])
+          def find_by_name(name, options = {})
+            load(service.list_users(options.merge(:name => name)).body["users"])
           end
 
           def destroy(id)

data/lib/fog/openstack/models/image_v2/image.rb

@@ -21,7 +21,7 @@ module Fog
           attribute :self
           attribute :file
 
-          #detailed
+          # detailed
           attribute :min_disk
           attribute :created_at
           attribute :updated_at
@@ -40,9 +40,29 @@ module Fog
           attribute :instance_uuid
           attribute :user_id
 
+          def method_missing(method_sym, *arguments, &block)
+            if attributes.key?(method_sym)
+              attributes[method_sym]
+            elsif attributes.key?(method_sym.to_s)
+              attributes[method_sym.to_s]
+            else
+              super
+            end
+          end
+
+          def respond_to?(method_sym, include_all = false)
+            if attributes.key?(method_sym)
+              true
+            elsif attributes.key?(method_sym.to_s)
+              true
+            else
+              super
+            end
+          end
+
           def create
             requires :name
-            merge_attributes(service.create_image(self.attributes).body)
+            merge_attributes(service.create_image(attributes).body)
             self
           end
 
@@ -60,88 +80,87 @@ module Fog
             attr.each do |key, value|
               op = (@attributes.keys.include? key) ? 'replace' : 'add'
               op = 'remove' if value.nil?
-              json_patch << {:op => op, :path => "/#{key}", :value => value }
+              json_patch << {:op => op, :path => "/#{key}", :value => value}
             end
             merge_attributes(
-                service.update_image(self.id, json_patch).body)
+              service.update_image(id, json_patch).body)
             self
           end
 
           def destroy
             requires :id
-            service.delete_image(self.id)
+            service.delete_image(id)
             true
           end
 
           def upload_data(io_obj)
             requires :id
-            if io_obj.is_a? Hash
-              service.upload_image(self.id, nil, io_obj)
+            if io_obj.kind_of? Hash
+              service.upload_image(id, nil, io_obj)
             else
-              service.upload_image(self.id, io_obj)
+              service.upload_image(id, io_obj)
             end
           end
 
-          def download_data(params={})
+          def download_data(params = {})
             requires :id
-            service.download_image(self.id, content_range=params[:content_range], params)
+            service.download_image(id, params[:content_range], params)
           end
 
           def reactivate
             requires :id
-            service.reactivate_image(self.id)
+            service.reactivate_image(id)
           end
 
           def deactivate
             requires :id
-            service.deactivate_image(self.id)
+            service.deactivate_image(id)
           end
 
           def add_member(member_id)
             requires :id
-            service.add_member_to_image(self.id, member_id)
+            service.add_member_to_image(id, member_id)
           end
 
           def remove_member(member_id)
             requires :id
-            service.remove_member_from_image(self.id, member_id)
+            service.remove_member_from_image(id, member_id)
           end
 
           def update_member(member)
             requires :id
-            service.update_image_member(self.id, member)
+            service.update_image_member(id, member)
           end
 
           def members
             requires :id
-            service.get_image_members(self.id).body['members']
+            service.get_image_members(id).body['members']
           end
 
           def member(member_id)
             requires :id
-            service.get_member_details(self.id, member_id)
+            service.get_member_details(id, member_id)
           end
 
           def add_tags(tags)
             requires :id
-            tags.each {|tag| add_tag tag}
+            tags.each { |tag| add_tag tag }
           end
 
           def add_tag(tag)
             requires :id
-            service.add_tag_to_image(self.id, tag)
+            service.add_tag_to_image(id, tag)
           end
 
           def remove_tags(tags)
             requires :id
-            tags.each {|tag| remove_tag tag}
+            tags.each { |tag| remove_tag tag }
           end
 
           def remove_tag(tag)
             requires :id
-            service.remove_tag_from_image(self.id, tag)
+            service.remove_tag_from_image(id, tag)
           end
-
         end
       end
     end

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

@@ -9,6 +9,7 @@ module Fog
         attribute :floating_network_id
         attribute :port_id
         attribute :tenant_id
+        attribute :router_id
         attribute :fixed_ip_address
         attribute :floating_ip_address
 

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

@@ -0,0 +1,33 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/network/rbac_policy'
+
+module Fog
+  module Network
+    class OpenStack
+      class RbacPolicies < Fog::OpenStack::Collection
+        attribute :filters
+
+        model Fog::Network::OpenStack::RbacPolicy
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters_arg = filters)
+          filters = filters_arg
+          load_response(service.list_rbac_policies(filters), 'rbac_policies')
+        end
+
+        def get(rbac_policy_id)
+          if rbac_policy = service.get_rbac_policy(rbac_policy_id).body['rbac_policy']
+            new(rbac_policy)
+          end
+        rescue Fog::Network::OpenStack::NotFound
+          nil
+        end
+        alias_method :find_by_id, :get
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Network
+    class OpenStack
+      class RbacPolicy < Fog::OpenStack::Model
+        identity :id
+
+        attribute :object_type
+        attribute :object_id
+        attribute :tenant_id
+        attribute :target_tenant
+        attribute :action
+
+        def create
+          requires :object_type, :object_id, :target_tenant, :action
+          merge_attributes(service.create_rbac_policy(attributes).body['rbac_policy'])
+          self
+        end
+
+        def update
+          requires :id, :target_tenant
+          merge_attributes(service.update_rbac_policy(id, attributes).body['rbac_policy'])
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_rbac_policy(id)
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module NFV
+    class OpenStack
+      class Vnf < Fog::OpenStack::Model
+        identity :id
+
+        attribute :status
+        attribute :name
+        attribute :tenant_id
+        attribute :instance_id
+        attribute :mgmt_url
+        attribute :description
+        attribute :vnf_attributes
+
+        # Attributes for create and update
+        attribute :vnf
+        attribute :auth
+
+        def create(options = {})
+          merge_attributes(service.create_vnf(default_options.merge(options)).body['vnf'])
+          self
+        end
+
+        def update(options = {})
+          merge_attributes(service.update_vnf(identity, default_options.merge(options)).body['vnf'])
+          self
+        end
+
+        def save(options = {})
+          identity ? update(options) : create(options)
+        end
+
+        def destroy
+          requires :id
+          service.delete_vnf(id)
+          true
+        end
+
+        def default_options
+          {
+            :vnf  => vnf,
+            :auth => auth
+          }
+        end
+
+        def vnf_attributes
+          attributes['attributes']
+        end
+
+        def ready?
+          status == 'ACTIVE'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module NFV
+    class OpenStack
+      class Vnfd < Fog::OpenStack::Model
+        identity :id
+
+        attribute :service_types
+        attribute :description
+        attribute :tenant_id
+        attribute :mgmt_driver
+        attribute :infra_driver
+        attribute :name
+        attribute :vnf_attributes
+
+        # Attributes for create
+        attribute :vnfd
+        attribute :auth
+
+        def create(options = {})
+          merge_attributes(service.create_vnfd(default_options.merge(options)).body['vnfd'])
+          self
+        end
+
+        def update(_options = {})
+          raise Fog::OpenStack::Errors::InterfaceNotImplemented.new("Method 'update' is not supported")
+        end
+
+        def save(options = {})
+          identity ? update(options) : create(options)
+        end
+
+        def destroy
+          requires :id
+          service.delete_vnfd(id)
+          true
+        end
+
+        def default_options
+          {
+            :vnfd => vnfd,
+            :auth => auth
+          }
+        end
+
+        def vnf_attributes
+          attributes['attributes']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/nfv/vnfd'
+
+module Fog
+  module NFV
+    class OpenStack
+      class Vnfds < Fog::OpenStack::Collection
+        model Fog::NFV::OpenStack::Vnfd
+
+        def all(options = {})
+          load_response(service.list_vnfds(options), 'vnfds')
+        end
+
+        def get(uuid)
+          data = service.get_vnfd(uuid).body['vnfd']
+          new(data)
+        rescue Fog::NFV::OpenStack::NotFound
+          nil
+        end
+
+        def destroy(uuid)
+          vnfd = get(uuid)
+          vnfd.destroy
+        end
+      end
+    end
+  end
+end