fog-openstack 0.1.5 → 0.1.6

data/lib/fog/openstack/volume_v2.rb

@@ -1,4 +1,4 @@
-
+require 'fog/openstack/core'
 require 'fog/openstack/common'
 require 'fog/openstack/volume'
 
@@ -23,6 +23,9 @@ module Fog
         model :volume_type
         collection :volume_types
 
+        model :snapshot
+        collection :snapshots
+
         model :transfer
         collection :transfers
 
@@ -32,6 +35,7 @@ module Fog
         request :list_volumes
         request :list_volumes_detailed
         request :create_volume
+        request :update_volume
         request :get_volume_details
         request :extend_volume
         request :delete_volume
@@ -44,11 +48,14 @@ module Fog
         request :delete_volume_type
         request :get_volume_type_details
 
-        request :create_volume_snapshot
+        request :create_snapshot
+        request :update_snapshot
         request :list_snapshots
         request :list_snapshots_detailed
         request :get_snapshot_details
         request :delete_snapshot
+        request :update_snapshot_metadata
+        request :delete_snapshot_metadata
 
         request :list_transfers
         request :list_transfers_detailed
@@ -60,22 +67,26 @@ module Fog
         request :update_quota
         request :get_quota
         request :get_quota_defaults
-
         request :get_quota_usage
 
+        request :update_metadata
+        request :replace_metadata
+        request :delete_metadata
+
         request :set_tenant
+        request :action
 
         class Mock
           def self.data
             @data ||= Hash.new do |hash, key|
               hash[key] = {
-                  :users   => {},
-                  :tenants => {},
-                  :quota   => {
-                      'gigabytes' => 1000,
-                      'volumes'   => 10,
-                      'snapshots' => 10
-                  }
+                :users   => {},
+                :tenants => {},
+                :quota   => {
+                  'gigabytes' => 1000,
+                  'volumes'   => 10,
+                  'snapshots' => 10
+                }
               }
             end
           end
@@ -84,7 +95,7 @@ module Fog
             @data = nil
           end
 
-          def initialize(options={})
+          def initialize(options = {})
             @openstack_username = options[:openstack_username]
             @openstack_tenant   = options[:openstack_tenant]
             @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -101,11 +112,11 @@ module Fog
             unless @data[:users].find { |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
+                'id'       => id,
+                'name'     => options[:openstack_username],
+                'email'    => "#{options[:openstack_username]}@mock.com",
+                'tenantId' => Fog::Mock.random_numbers(6).to_s,
+                'enabled'  => true
               }
             end
           end
@@ -133,7 +144,7 @@ module Fog
           end
           include Fog::OpenStack::Common
 
-          def initialize(options={})
+          def initialize(options = {})
             initialize_identity options
 
             @openstack_service_type  = options[:openstack_service_type] || ['volumev2']
@@ -154,11 +165,8 @@ module Fog
             @persistent = options[:persistent] || false
             @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
           end
-
-          private
-
         end
       end
     end
   end
-end
+end

data/supported.md

@@ -0,0 +1,54 @@
+# Supported OpenStack Projects
+
+## Supported
+
+| Project          | Fog Type      | API Version(s) | Compliance | Notes |
+|------------------|---------------|----------------|------------|-------|
+| Ceilometer       | Metering      | v2             | TBD        |       |
+| Cinder           | Volume        | v1, v2         | TBD        |       |
+| Glance           | Image         | v1, v2         | TBD        |       |
+| Heat             | Orchestration | v1             | TBD        |       |
+| Keystone         | Identity      | v2, v3         | TBD        |       |
+| Neutron          | Network       | v2             | TBD        |       |
+| Nova             | Compute       | v2.0           | TBD        |       |
+| Ironic           | Bare Metal    | v1             | TBD        |       |
+| Ironic Inspector | Introspection | v1             | TBD        |       |
+| Swift            | Storage       | v2             | TBD        |       |
+| Tacker           | NFV           | v1             | TBD        |       |
+
+## Wish List
+
+Feel free to submit pull requests to add support for these.
+
+* [barbican](https://wiki.openstack.org/wiki/Barbican) (Key Management)
+* [congress](https://wiki.openstack.org/wiki/Congress) (Policy As a Service)
+* [designate](https://wiki.openstack.org/wiki/Designate) (DNSaaS)
+* [magnum](https://wiki.openstack.org/wiki/Magnum) (Containers)
+* [manila](https://wiki.openstack.org/wiki/Manila) (File Storage)
+* [monasca](https://wiki.openstack.org/wiki/Monasca) (Monitoring)
+* [trove](https://wiki.openstack.org/wiki/Trove) (DBaaS)
+
+## Unsupported
+
+* aodh (Telemetry Alarms)
+* astara (Network)
+* cloudkitty (Telemetry)
+* cue (Messaging)
+* dragonflow (Network)
+* ec2-api (Compatibility Layer)
+* freezer (Disaster Recovery)
+* fuel (Orchestration)
+* gnocchi (TSDB)
+* horizon (Web Frontend)
+* kolla (Containers)
+* kuryr (Containers)
+* mistral (Workflow)
+* murano (Catalog Service)
+* rally (Benchmarking)
+* sahara (Map-Reduce)
+* searchlight (Searching)
+* senlin (Clustering)
+* solum (Lifecycle)
+* tripleo (Orchestration)
+* zaqar (Messaging)
+

data/tests/openstack/models/identity/ec2_credential_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests("Fog::Identity[:openstack] | ec2_credential", ['openstack']) do
   before do
-    openstack = Fog::Identity[:openstack]
+    openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
     tenant_id = openstack.list_tenants.body['tenants'].first['id']
 
     @user = openstack.users.find { |user| user.name == 'foobar' }

data/tests/openstack/models/identity/ec2_credentials_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests("Fog::Identity[:openstack] | ec2_credentials", ['openstack']) do
   before do
-    openstack = Fog::Identity[:openstack]
+    openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
     tenant_id = openstack.list_tenants.body['tenants'].first['id']
 
     @user = openstack.users.find { |user| user.name == 'foobar' }

data/tests/openstack/models/identity/role_tests.rb

@@ -1,7 +1,12 @@
 Shindo.tests("Fog::Identity[:openstack] | role", ['openstack']) do
-  @instance = Fog::Identity[:openstack].roles.new({:name => 'Role Name', :user_id => 1, :role_id => 1})
-  @tenant   = Fog::Identity[:openstack].tenants.create(:name => 'test_user')
-  @user     = Fog::Identity[:openstack].users.create(:name => 'test_user', :tenant_id => @tenant.id, :password => 'spoof')
+  @identity = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+  @instance = @identity.roles.new(
+    :name    => 'Role Name',
+    :user_id => 1,
+    :role_id => 1
+  )
+  @tenant   = @identity.tenants.create(:name => 'test_user')
+  @user     = @identity.users.create(:name => 'test_user', :tenant_id => @tenant.id, :password => 'spoof')
 
   tests('success') do
     tests('#save').returns(true) do

data/tests/openstack/models/identity/roles_tests.rb

@@ -1,8 +1,9 @@
 Shindo.tests("Fog::Identity[:openstack] | roles", ['openstack']) do
-  @tenant   = Fog::Identity[:openstack].tenants.create(:name => 'test_user')
-  @user     = Fog::Identity[:openstack].users.create(:name => 'test_user', :tenant_id => @tenant.id, :password => 'spoof')
-  @role     = Fog::Identity[:openstack].roles(:user => @user, :tenant => @tenant).create(:name => 'test_role')
-  @roles    = Fog::Identity[:openstack].roles(:user => @user, :tenant => @tenant)
+  @identity = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+  @tenant   = @identity.tenants.create(:name => 'test_user')
+  @user     = @identity.users.create(:name => 'test_user', :tenant_id => @tenant.id, :password => 'spoof')
+  @role     = @identity.roles(:user => @user, :tenant => @tenant).create(:name => 'test_role')
+  @roles    = @identity.roles(:user => @user, :tenant => @tenant)
 
   tests('success') do
     tests('#all').succeeds do

data/tests/openstack/models/identity/tenant_tests.rb

@@ -1,20 +1,23 @@
 Shindo.tests("Fog::Identity[:openstack] | tenant", ['openstack']) do
   tests('success') do
+    @openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+
     tests('#roles_for(0)').succeeds do
-      instance = Fog::Identity[:openstack].tenants.first
+      instance = @openstack.tenants.first
       instance.roles_for(0)
     end
 
     tests('#users').succeeds do
-      instance = Fog::Identity[:openstack].tenants.first
+      instance = @openstack.tenants.first
+      openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
 
-      instance.users.count != Fog::Identity[:openstack].users.count
+      instance.users.count != openstack.users.count
     end
   end
 
   tests('CRUD') do
     tests('#create').succeeds do
-      @instance = Fog::Identity[:openstack].tenants.create(:name => 'test')
+      @instance = @openstack.tenants.create(:name => 'test')
       !@instance.id.nil?
     end
 

data/tests/openstack/models/identity/tenants_tests.rb

@@ -1,14 +1,17 @@
 Shindo.tests("Fog::Compute[:openstack] | tenants", ['openstack']) do
-  @instance = Fog::Identity[:openstack].tenants.create(:name => 'test')
+  openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+  @instance = openstack.tenants.create(:name => 'test')
 
   tests('success') do
     tests('#find_by_id').succeeds do
-      tenant = Fog::Identity[:openstack].tenants.find_by_id(@instance.id)
+      openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+      tenant = openstack.tenants.find_by_id(@instance.id)
       tenant.id == @instance.id
     end
 
     tests('#destroy').succeeds do
-      Fog::Identity[:openstack].tenants.destroy(@instance.id)
+      openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+      openstack.tenants.destroy(@instance.id)
     end
   end
 
@@ -16,11 +19,13 @@ Shindo.tests("Fog::Compute[:openstack] | tenants", ['openstack']) do
     pending if Fog.mocking?
 
     tests('#find_by_id').raises(Fog::Identity::OpenStack::NotFound) do
-      Fog::Identity[:openstack].tenants.find_by_id('fake')
+      openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+      openstack.tenants.find_by_id('fake')
     end
 
     tests('#destroy').raises(Fog::Identity::OpenStack::NotFound) do
-      Fog::Identity[:openstack].tenants.destroy('fake')
+      openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+      openstack.tenants.destroy('fake')
     end
   end
 end

data/tests/openstack/models/identity/user_tests.rb

@@ -1,12 +1,13 @@
 Shindo.tests("Fog::Identity[:openstack] | user", ['openstack']) do
-  tenant_id = Fog::Identity[:openstack].list_tenants.body['tenants'].first['id']
-  @instance = Fog::Identity[:openstack].users.new({
+  openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+  tenant_id = openstack.list_tenants.body['tenants'].first['id']
+  @instance = openstack.users.new(
     :name      => 'User Name',
     :email     => 'test@fog.com',
     :tenant_id => tenant_id,
     :password  => 'spoof',
     :enabled   => true
-  })
+  )
 
   tests('success') do
     tests('#save').returns(true) do

data/tests/openstack/models/identity/users_tests.rb

@@ -1,26 +1,30 @@
 Shindo.tests("Fog::Identity[:openstack] | users", ['openstack']) do
-  tenant_id = Fog::Identity[:openstack].list_tenants.body['tenants'].first['id']
-  @instance = Fog::Identity[:openstack].users.create({
+  openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+  tenant_id = openstack.list_tenants.body['tenants'].first['id']
+  @instance = openstack.users.create(
     :name      => 'foobar',
     :email     => 'foo@bar.com',
     :tenant_id => tenant_id,
     :password  => 'spoof',
     :enabled   => true
-  })
+  )
 
   tests('success') do
     tests('#find_by_id').succeeds do
-      user = Fog::Identity[:openstack].users.find_by_id(@instance.id)
+      openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+      user = openstack.users.find_by_id(@instance.id)
       user.id == @instance.id
     end
 
     tests('#find_by_name').succeeds do
-      user = Fog::Identity[:openstack].users.find_by_name(@instance.name)
+      openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+      user = openstack.users.find_by_name(@instance.name)
       user.name == @instance.name
     end
 
     tests('#destroy').succeeds do
-      Fog::Identity[:openstack].users.destroy(@instance.id)
+      openstack = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+      openstack.users.destroy(@instance.id)
     end
   end
 

data/tests/openstack/models/nfv/vnf_tests.rb

@@ -0,0 +1,35 @@
+Shindo.tests("Fog::NFV[:openstack] | vnf", ['openstack']) do
+  tests('success') do
+    tests('#create').succeeds do
+      vnfd_data = {:attributes    => {:vnfd => "template_name: sample-vnfd\ndescription: demo-example\n\nservice_prop"\
+                                               "erties:\n  Id: sample-vnfd\n  vendor: tacker\n  version: 1\n\nvdus:\n"\
+                                               "  vdu1:\n    id: vdu1\n    vm_image: cirros\n    instance_type: m1.ti"\
+                                               "ny\n\n    network_interfaces:\n      management:\n        network: ne"\
+                                               "t_mgmt\n        management: true\n      pkt_in:\n        network: net"\
+                                               "0\n      pkt_out:\n        network: net1\n\n    placement_policy:\n  "\
+                                               "    availability_zone: nova\n\n    auto-scaling: noop\n\n    config:"\
+                                               "\n      param0: key0\n      param1: key1\n"},
+                   :service_types => [{:service_type => "vnfd"}],
+                   :mgmt_driver   => "noop",
+                   :infra_driver  => "heat"}
+      auth      = {"tenantName" => "admin", "passwordCredentials" => {"username" => "admin", "password" => "password"}}
+      @vnfd     = Fog::NFV[:openstack].vnfds.create(:vnfd => vnfd_data, :auth => auth)
+      vnf_data  = {:vnfd_id => @vnfd.id, :name => 'Test'}
+      @vnf      = Fog::NFV[:openstack].vnfs.create(:vnf => vnf_data, :auth => auth)
+    end
+
+    Fog::NFV[:openstack].vnfs.get(@vnf.id).wait_for { ready? }
+
+    tests('#update').succeeds do
+      @vnf.vnf = {:attributes => {:config => "vdus:\n  vdu1:<sample_vdu_config> \n\n"}}
+      @vnf.update
+    end
+
+    tests('#destroy').succeeds do
+      sleep(10) unless Fog.mocking?
+
+      @vnf.destroy
+      @vnfd.destroy
+    end
+  end
+end

data/tests/openstack/models/nfv/vnfd_tests.rb

@@ -0,0 +1,23 @@
+Shindo.tests("Fog::NFV[:openstack] | vnf", ['openstack']) do
+  tests('success') do
+    tests('#create').succeeds do
+      vnfd_data = {:attributes    => {:vnfd => "template_name: sample-vnfd\ndescription: demo-example\n\nservice_prop"\
+                                               "erties:\n  Id: sample-vnfd\n  vendor: tacker\n  version: 1\n\nvdus:\n"\
+                                               "  vdu1:\n    id: vdu1\n    vm_image: cirros\n    instance_type: m1.ti"\
+                                               "ny\n\n    network_interfaces:\n      management:\n        network: ne"\
+                                               "t_mgmt\n        management: true\n      pkt_in:\n        network: net"\
+                                               "0\n      pkt_out:\n        network: net1\n\n    placement_policy:\n  "\
+                                               "    availability_zone: nova\n\n    auto-scaling: noop\n\n    config:"\
+                                               "\n      param0: key0\n      param1: key1\n"},
+                   :service_types => [{:service_type => "vnfd"}],
+                   :mgmt_driver   => "noop",
+                   :infra_driver  => "heat"}
+      auth      = {"tenantName" => "admin", "passwordCredentials" => {"username" => "admin", "password" => "password"}}
+      @vnfd = Fog::NFV[:openstack].vnfds.create(:vnfd => vnfd_data, :auth => auth)
+    end
+
+    tests('#destroy').succeeds do
+      @vnfd.destroy == true
+    end
+  end
+end

data/tests/openstack/models/nfv/vnfds_tests.rb

@@ -0,0 +1,31 @@
+Shindo.tests("Fog::NFV[:openstack] | vnfs", ['openstack']) do
+  vnfd_data = {:attributes    => {:vnfd => "template_name: sample-vnfd\ndescription: demo-example\n\nservice_prop"\
+                                           "erties:\n  Id: sample-vnfd\n  vendor: tacker\n  version: 1\n\nvdus:\n"\
+                                           "  vdu1:\n    id: vdu1\n    vm_image: cirros\n    instance_type: m1.ti"\
+                                           "ny\n\n    network_interfaces:\n      management:\n        network: ne"\
+                                           "t_mgmt\n        management: true\n      pkt_in:\n        network: net"\
+                                           "0\n      pkt_out:\n        network: net1\n\n    placement_policy:\n  "\
+                                           "    availability_zone: nova\n\n    auto-scaling: noop\n\n    config:"\
+                                           "\n      param0: key0\n      param1: key1\n"},
+               :service_types => [{:service_type => "vnfd"}],
+               :mgmt_driver   => "noop",
+               :infra_driver  => "heat"}
+  auth      = {"tenantName" => "admin", "passwordCredentials" => {"username" => "admin", "password" => "password"}}
+  @vnfd     = Fog::NFV[:openstack].vnfds.create(:vnfd => vnfd_data, :auth => auth)
+
+  tests('success') do
+    tests('#find_by_id').succeeds do
+      vnf = Fog::NFV[:openstack].vnfds.find_by_id(@vnfd.id)
+      vnf.id == @vnfd.id
+    end
+
+    tests('#get').succeeds do
+      vnf = Fog::NFV[:openstack].vnfds.get(@vnfd.id)
+      vnf.id == @vnfd.id
+    end
+
+    tests('#destroy').succeeds do
+      Fog::NFV[:openstack].vnfds.destroy(@vnfd.id)
+    end
+  end
+end

data/tests/openstack/models/nfv/vnfs_tests.rb

@@ -0,0 +1,38 @@
+Shindo.tests("Fog::NFV[:openstack] | vnfs", ['openstack']) do
+  vnfd_data = {:attributes    => {:vnfd => "template_name: sample-vnfd\ndescription: demo-example\n\nservice_prop"\
+                                           "erties:\n  Id: sample-vnfd\n  vendor: tacker\n  version: 1\n\nvdus:\n"\
+                                           "  vdu1:\n    id: vdu1\n    vm_image: cirros\n    instance_type: m1.ti"\
+                                           "ny\n\n    network_interfaces:\n      management:\n        network: ne"\
+                                           "t_mgmt\n        management: true\n      pkt_in:\n        network: net"\
+                                           "0\n      pkt_out:\n        network: net1\n\n    placement_policy:\n  "\
+                                           "    availability_zone: nova\n\n    auto-scaling: noop\n\n    config:"\
+                                           "\n      param0: key0\n      param1: key1\n"},
+               :service_types => [{:service_type => "vnfd"}],
+               :mgmt_driver   => "noop",
+               :infra_driver  => "heat"}
+  auth      = {"tenantName" => "admin", "passwordCredentials" => {"username" => "admin", "password" => "password"}}
+  @vnfd     = Fog::NFV[:openstack].vnfds.create(:vnfd => vnfd_data, :auth => auth)
+  vnf_data  = {:vnfd_id => @vnfd.id, :name => 'Test'}
+  @vnf      = Fog::NFV[:openstack].vnfs.create(:vnf => vnf_data, :auth => auth)
+
+  Fog::NFV[:openstack].vnfs.get(@vnf.id).wait_for { ready? }
+
+  tests('success') do
+    tests('#find_by_id').succeeds do
+      vnf = Fog::NFV[:openstack].vnfs.find_by_id(@vnf.id)
+      vnf.id == @vnf.id
+    end
+
+    tests('#get').succeeds do
+      vnf = Fog::NFV[:openstack].vnfs.get(@vnf.id)
+      vnf.id == @vnf.id
+    end
+
+    tests('#destroy').succeeds do
+      sleep(10) unless Fog.mocking?
+
+      Fog::NFV[:openstack].vnfs.destroy(@vnf.id)
+      Fog::NFV[:openstack].vnfds.destroy(@vnfd.id)
+    end
+  end
+end