kitchen-vra 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f27173f48addd541a3b46e530123bf9a5860d196d9b29e6a6e2a32f2df46de2
-  data.tar.gz: 6d39ffccc15bc8ffdb6b924ba5bfd898bad4603b7e2b13b8687978f22292f957
+  metadata.gz: 17c5b9a3f8bcfc3b3379c27f41ebf221245f145752cc14d0c4eb6a811a7e8c8a
+  data.tar.gz: 9484530af696bbf2045bc4197d9e216a02ef6f022d7ad2e6f1b1baa39a50d47a
 SHA512:
-  metadata.gz: cfc73043b2fc6bcccf21194568782e1195d4ad3dc4859022c409231e2234c21a6cda61fa2d27487c7136fb30dc7363a424aa8edcc0d0a603e699d531f559bd3c
-  data.tar.gz: 133feaf18a36b1a5f1846b7fcc1f10d0c1b2ab59070fca23770b69de4641eedd0ad552cd96062f536c2787f6aa5bf91d740b7191e89829f27c3dfcaa410a614d
+  metadata.gz: 7ff58b2eaad6c83cff51a0bf5d6072424d4e6e21bbdf4f3e12cb20024222b8f5f9f45351db15e39b798f9fb549d5b2cd5e3546d51d36f9fb84ebb9b83709db8c
+  data.tar.gz: 6dbe6294fa6a2973932e4960b45fb738771c013ecb89a9f2cbbd30a3f7f3c379158e2ef70604b980db284f3580e8a01014b93190ffe0fa0bf27f35bae1da1cee

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v3.3.2](https://github.com/chef-partners/kitchen-vra/tree/v3.3.2)
+
+[Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v3.3.1...v3.3.2)
+
+- This change helps in getting unique name of a deployment. The new deployement name will be deployment_deploymentId. We need to pass **unique_name** as true(unique_name: true) in the driver configuration.
+
+## [v3.3.1](https://github.com/chef-partners/kitchen-vra/tree/v3.3.1)
+
+[Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v3.3.0...v3.3.1)
+
+- Fixed the issue with catalog lookup using catalog_name config [\#61](https://github.com/chef-partners/kitchen-vra/pull/61) ([ashiqueps](https://github.com/ashiqueps))
+
 ## [v3.3.0](https://github.com/chef-partners/kitchen-vra/tree/v3.3.0)
 
 [Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v3.2.1...v3.3.0)

data/kitchen-vra.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "test-kitchen"
   spec.add_dependency "vmware-vra", "~> 3.0", ">= 3.2.0" # 3.0 required for vRA 8.x
   spec.add_dependency "highline"
-  spec.add_dependency "rack", ">= 1.6", "< 3.0"
+  spec.add_dependency "rack", ">= 1.6", "< 4.0"
   spec.add_dependency "ffi-yajl", ">= 2.2.3", "< 2.5.0"
   spec.add_development_dependency "rake",      "~> 13.0"
   spec.add_development_dependency "rspec",     "~> 3.2"

data/lib/kitchen/driver/vra.rb

@@ -45,12 +45,11 @@ module Kitchen
       default_config :catalog_id, nil
       default_config :catalog_name, nil
 
-      default_config :subtenant_id, nil
-      default_config :subtenant_name, nil
       default_config :verify_ssl, true
       default_config :request_timeout, 600
       default_config :request_refresh_rate, 2
       default_config :server_ready_retries, 1
+      default_config :unique_name, false
       default_config :deployment_name do |driver|
         driver&.instance&.platform&.name
       end
@@ -154,6 +153,9 @@ module Kitchen
         deployment_request = catalog_request.submit
 
         info("Catalog request #{deployment_request.id} submitted.")
+        if config[:unique_name]
+          info("Deployment name is deployment_#{deployment_request.id}")
+        end
 
         wait_for_request(deployment_request)
         raise "The vRA request failed: #{deployment_request.completion_details}" if deployment_request.failed?
@@ -218,37 +220,30 @@ module Kitchen
       def catalog_request # rubocop:disable Metrics/MethodLength
         unless config[:catalog_name].nil?
           info("Fetching Catalog ID by Catalog Name")
-          response =  vra_client.catalog.fetch_catalog_items(config[:catalog_name])
-          parsed_json = JSON.parse(response.body)
+          catalog_items = vra_client.catalog.fetch_catalog_items(config[:catalog_name])
           begin
-            config[:catalog_id] = parsed_json["content"][0]["catalogItemId"]
+            config[:catalog_id] = catalog_items[0].id
+            info("Using Catalog with ID: #{catalog_items[0].id}")
           rescue
-            puts "Unable to retrieve Catalog ID from Catalog Name: #{config[:catalog_name]}"
+            error("Unable to retrieve Catalog ID from Catalog Name: #{config[:catalog_name]}")
           end
         end
 
+        if config[:catalog_id].nil?
+          raise Kitchen::InstanceFailure, "Unable to create deployment without a valid catalog"
+        end
+
         deployment_params = {
           image_mapping: config[:image_mapping],
           flavor_mapping: config[:flavor_mapping],
-          name: config[:deployment_name],
           project_id: config[:project_id],
           version: config[:version],
-        }
+        }.tap do |h|
+          h[:name] = config[:deployment_name] unless config[:unique_name]
+        end
 
         catalog_request = vra_client.catalog.request(config[:catalog_id], deployment_params)
 
-        unless config[:subtenant_name].nil?
-          info("Fetching Subtenant ID by Subtenant Name")
-          response = vra_client.fetch_subtenant_items(config[:tenant], config[:subtenant_name])
-          parsed_json = JSON.parse(response.body)
-          begin
-            config[:subtenant_id] = parsed_json["content"][0]["id"]
-          rescue
-            puts "Unable to retrieve Subtenant ID from Subtenant Name: #{config[:subtenant_name]}"
-          end
-        end
-        catalog_request.subtenant_id = config[:subtenant_id] unless config[:subtenant_id].nil?
-
         config[:extra_parameters].each do |key, value_data|
           catalog_request.set_parameters(key, value_data)
         end

data/lib/kitchen/driver/vra_version.rb

@@ -20,6 +20,6 @@
 
 module Kitchen
   module Driver
-    VRA_VERSION = "3.3.0"
+    VRA_VERSION = "3.3.2"
   end
 end

data/spec/vra_spec.rb

@@ -41,9 +41,9 @@ describe Kitchen::Driver::Vra do
       image_mapping:   "VRA-nc-lnx-ce8.4-Docker",
       flavor_mapping:  "Small",
       verify_ssl:      true,
-      subtenant_id:    "160b473a-0ec9-473d-8156-28dd96c0b6b7",
       use_dns:         false,
       deployment_name: "test-instance",
+      catalog_id:      "1536b95d-68fe-3c68-9417-46ed24bee3ef",
     }
   end
 
@@ -399,7 +399,7 @@ describe Kitchen::Driver::Vra do
       allow(driver).to receive(:vra_client).and_return(vra_client)
       allow(vra_client).to receive(:catalog).and_return(catalog)
       allow(catalog).to receive(:request).and_return(catalog_request)
-      %i{subtenant_id= set_parameter}.each do |method|
+      %i{catalog_id= set_parameter}.each do |method|
         allow(catalog_request).to receive(method)
       end
     end
@@ -420,11 +420,12 @@ describe Kitchen::Driver::Vra do
           project_id:      "6ba69375-79d5-42c3-a099-7d32739f71a7",
           image_mapping:   "VRA-nc-lnx-ce8.4-Docker",
           flavor_mapping:  "Small",
+          catalog_id:      "2kabc423-af89-56fc-990a-82fab34ed12",
         }
       end
 
       it "does not attempt to set params on the catalog_request" do
-        expect(catalog_request).not_to receive(:subtenant_id=)
+        expect(catalog_request).not_to receive(:set_parameters)
         driver.catalog_request
       end
     end
@@ -440,6 +441,7 @@ describe Kitchen::Driver::Vra do
           project_id:       "6ba69375-79d5-42c3-a099-7d32739f71a7",
           image_mapping:    "VRA-nc-lnx-ce8.4-Docker",
           flavor_mapping:   "Small",
+          catalog_id:      "2kabc423-af89-56fc-990a-82fab34ed12",
           extra_parameters: { "key1" => { type: "string", value: "value1" },
                               "key2" => { type: "integer", value: 123 } },
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vra
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Chef Commmunity Tools Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -67,7 +67,7 @@ dependencies:
         version: '1.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ dependencies:
         version: '1.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement