vcloud-core 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.7 (2014-03-03)
+
+Bugfixes:
+
+  - vAppTemplate not retrieved if ISO exists with similar name [#66758184]
+
 ## 0.0.6 (2014-02-13)
 
 Features:

data/Rakefile

@@ -6,11 +6,16 @@ RSpec::Core::RakeTask.new(:spec) do |task|
   # tests to accidentially run (and succeed against!) an actual
   # environment, if Fog connection is not stubbed correctly.
   ENV['FOG_CREDENTIAL'] = 'random_nonsense_owiejfoweijf'
+  ENV['COVERAGE'] = 'true'
   task.pattern = FileList['spec/vcloud/**/*_spec.rb']
 end
 
 task :default => [:spec]
 
+RSpec::Core::RakeTask.new('integration') do |t|
+  t.pattern = FileList['spec/integration/**/*_spec.rb']
+end
+
 require "gem_publisher"
 task :publish_gem do |t|
   gem = GemPublisher.publish_if_updated("vcloud-core.gemspec", :rubygems)

data/lib/vcloud/core/vapp_template.rb

@@ -23,11 +23,27 @@ module Vcloud
         vcloud_attributes[:name]
       end
 
+      def self.get_ids_by_name_and_catalog name, catalog_name
+        raise "provide Catalog and vAppTemplate name" unless name && catalog_name
+        q = Query.new(
+          'vAppTemplate',
+          :filter => "name==#{name};catalogName==#{catalog_name}"
+        )
+        unless query_results = q.get_all_results
+          raise "Error retreiving #{q.type} query '#{q.filter}'"
+        end
+        query_results.collect do |record|
+          record[:href].split('/').last if record.key?(:href)
+        end
+      end
+
       def self.get catalog_name, catalog_item_name
-        raise "provide catalog and catalog item name to load vappTemplate" unless catalog_name && catalog_item_name
-        body = Vcloud::Fog::ServiceInterface.new.template(catalog_name, catalog_item_name)
-        raise 'Could not find template vApp' unless body && body.key?(:href)
-        self.new(body[:href].split('/').last)
+        ids = self.get_ids_by_name_and_catalog(catalog_item_name, catalog_name)
+        raise 'Could not find template vApp' if ids.size == 0
+        if ids.size > 1
+          raise "Template #{catalog_item_name} is not unique in catalog #{catalog_name}"
+        end
+        return self.new(ids.first)
       end
 
       def self.id_prefix

data/lib/vcloud/core/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Core
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/lib/vcloud/fog/service_interface.rb

@@ -192,14 +192,6 @@ module Vcloud
         response_body[:VAppRecord].detect { |record| record[:vdcName] == vdc_name }
       end
 
-      def catalog(name)
-        link = org[:Link].select { |l| l[:rel] == RELATION::CHILD }.detect do |l|
-          l[:type] == ContentTypes::CATALOG && l[:name] == name
-        end
-        raise "catalog #{name} cannot be found" unless link
-        @fog.get_catalog(extract_id(link))
-      end
-
       def vdc(name)
         link = org[:Link].select { |l| l[:rel] == RELATION::CHILD }.detect do |l|
           l[:type] == ContentTypes::VDC && l[:name] == name
@@ -209,19 +201,6 @@ module Vcloud
 
       end
 
-      def template(catalog_name, template_name)
-        link = catalog(catalog_name)[:CatalogItems][:CatalogItem].detect do |l|
-          l[:type] == ContentTypes::CATALOG_ITEM && l[:name].match(template_name)
-        end
-        if link.nil?
-          Vcloud::Core.logger.warn("Template #{template_name} not found in catalog #{catalog_name}")
-          return nil
-        end
-        catalog_item = @fog.get_catalog_item(extract_id(link))
-        catalog_item[:Entity]
-      end
-
-
       def put_network_connection_system_section_vapp(vm_id, section)
         begin
           Vcloud::Core.logger.info("adding NIC into VM #{vm_id}")

data/spec/spec_helper.rb

@@ -1,26 +1,29 @@
-require 'simplecov'
+if ENV['COVERAGE']
+  require 'simplecov'
 
-SimpleCov.profiles.define 'gem' do
-  add_filter '/spec/'
-  add_filter '/features/'
-  add_filter '/vendor/'
+  SimpleCov.profiles.define 'gem' do
+    add_filter '/spec/'
+    add_filter '/features/'
+    add_filter '/vendor/'
 
-  add_group 'Libraries', '/lib/'
-end
+    add_group 'Libraries', '/lib/'
+  end
 
-SimpleCov.start 'gem'
+  SimpleCov.start 'gem'
+end
 
 require 'bundler/setup'
 require 'vcloud/core'
 require 'support/stub_fog_interface.rb'
 
-
-SimpleCov.at_exit do
-  SimpleCov.result.format!
-  # do not change the coverage percentage, instead add more unit tests to fix coverage failures.
-  if SimpleCov.result.covered_percent < 71
-    print "ERROR::BAD_COVERAGE\n"
-    print "Coverage is less than acceptable limit(71%). Please add more tests to improve the coverage"
-    exit(1)
+if ENV['COVERAGE']
+  SimpleCov.at_exit do
+    SimpleCov.result.format!
+    # do not change the coverage percentage, instead add more unit tests to fix coverage failures.
+    if SimpleCov.result.covered_percent < 71
+      print "ERROR::BAD_COVERAGE\n"
+      print "Coverage is less than acceptable limit(71%). Please add more tests to improve the coverage"
+      exit(1)
+    end
   end
 end

data/spec/vcloud/core/vapp_template_spec.rb

@@ -49,23 +49,39 @@ module Vcloud
       context '#get' do
 
         it 'should raise a RuntimeError if there is no template' do
-          @mock_fog_interface.should_receive(:template).
-            with('test_catalog', 'test_template').and_return(nil)
+          q_results = [ ]
+          mock_query = double(:query, :get_all_results => q_results)
+          Vcloud::Query.should_receive(:new).
+            with('vAppTemplate', :filter => "name==test_template;catalogName==test_catalog").
+            and_return(mock_query)
           expect { VappTemplate.get('test_catalog', 'test_template') }.
             to raise_error('Could not find template vApp')
         end
 
+        it 'should raise an error if more than one template is returned' do
+          q_results = [
+            { :name => 'test_template',
+              :href => "/vappTemplate-12345678-90ab-cdef-0123-4567890ab001" },
+            { :name => 'test_template',
+              :href => "/vappTemplate-12345678-90ab-cdef-0123-4567890ab002" },
+          ]
+          mock_query = double(:query, :get_all_results => q_results)
+          Vcloud::Query.should_receive(:new).
+            with('vAppTemplate', :filter => "name==test_template;catalogName==test_catalog").
+            and_return(mock_query)
+          expect { VappTemplate.get('test_catalog', 'test_template') }.
+            to raise_error('Template test_template is not unique in catalog test_catalog')
+        end
 
         it 'should return a valid template object if it exists' do
-          test_catalog_item_entity = {
-              :href => "/vappTemplate-12345678-90ab-cdef-0123-4567890abcde"
-          }
-          @mock_fog_interface.should_receive(:template).
-            with('test_catalog', 'test_template').
-            and_return(test_catalog_item_entity)
-          Vcloud::Fog::ServiceInterface.should_receive(:new).
-            and_return(@mock_fog_interface)
-
+          q_results = [
+            { :name => 'test_template',
+              :href => "/vappTemplate-12345678-90ab-cdef-0123-4567890abcde" }
+          ]
+          mock_query = double(:query, :get_all_results => q_results)
+          Vcloud::Query.should_receive(:new).
+            with('vAppTemplate', :filter => "name==test_template;catalogName==test_catalog").
+            and_return(mock_query)
           test_template = VappTemplate.get('test_catalog', 'test_template')
           test_template.id.should == 'vappTemplate-12345678-90ab-cdef-0123-4567890abcde'
         end

data/spec/vcloud/fog/service_interface_spec.rb

@@ -18,17 +18,6 @@ module Vcloud
         expect { service_interface.vdc('DoesNotExist') }.to raise_exception(RuntimeError, 'vdc DoesNotExist cannot be found')
       end
 
-      it 'should raise a exception if named catalog cannot be found in the data returned' do
-
-        fog_facade = double(:FogFacade)
-        expect(fog_facade).to receive(:session).and_return { FOG_SESSION_RESPONSE }
-        expect(fog_facade).to receive(:get_organization).and_return { FOG_ORGANIZATION_RESPONSE }
-
-        service_interface = ServiceInterface.new(fog_facade)
-
-        expect { service_interface.catalog('DoesNotExist') }.to raise_exception(RuntimeError, 'catalog DoesNotExist cannot be found')
-      end
-
       context 'configure edge gateway' do
         before(:each) do
           @config = { :Blah => 'TestData' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-core
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4034652362745429730
+      hash: -512267274305654333
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23