knife-vrealize 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26774900025bacb20c92669ec354fa5eecf896a05e5dc0360639bc3c58b58998
-  data.tar.gz: c374fd4befb4616243716ddd664a509f13c33d9a1254d1c0af3985103604c7dd
+  metadata.gz: 82a3ba6a329237518849cf8dd289a8bb419a44a0625bd4cb2749fc5703b96cac
+  data.tar.gz: '0835ab33c89a8c15910ad3a413cd32e6fe561a052fb4dc6591005290a6f71577'
 SHA512:
-  metadata.gz: 29be7394fb628f6ff10f98e63b3d4a01ec3ab7bcdc8d23c35140dc754481051be09bd9668ce2f73ee169d9f380197c8114bf611e90e9e6fcb142ff0cbfaf2a94
-  data.tar.gz: 48870906b9cc159ff4c95faac60f3a4a1e8657b9b1f82003e0441534eb1b2fda359fba59869b0502b6e67cbf3631e1674f51e3fa3be635dd25bd1a70a7a454ef
+  metadata.gz: eb42ddad92fa6beb58a3f8147bc7c0d10e6f85cbbdc42ccb88cb365252aa4a16fed10233c895ee5b6e01a195df5c08efc3b2b84c043c2558f9a53fd03cf4f2e0
+  data.tar.gz: b2a456df3b78bf29156eaab3d35b09a9286c7624c24de77dd580e9f5870025ac787ead37ac296ff05527a4fccb7b528c8619078c9557557d6073f899176f13ad

data/lib/chef/knife/cloud/vra_service.rb

@@ -54,11 +54,11 @@ class Chef
         def create_server(options = {})
           submitted_request = catalog_request(options).submit
           ui.msg("Catalog request #{submitted_request.id} submitted.")
-          wait_for_request(submitted_request, options[:wait_time].to_i, options[:refresh_rate])
+          wait_for_request(submitted_request, (options[:wait_time] || 600).to_i, options[:refresh_rate] || 2)
           ui.msg("Catalog request complete.\n")
           request_summary(submitted_request)
 
-          raise CloudExceptions::ServerCreateError, submitted_request.completion_details if submitted_request.failed?
+          raise CloudExceptions::ServerCreateError if submitted_request.failed?
 
           servers = submitted_request.resources.select(&:vm?)
           raise CloudExceptions::ServerCreateError, "The vRA request created more than one server, but we were only expecting 1" if servers.length > 1
@@ -67,8 +67,9 @@ class Chef
           servers.first
         end
 
-        def delete_server(instance_id)
-          server = get_server(instance_id)
+        def delete_server(deployment_id)
+          deployment = get_deployment(deployment_id)
+          server = deployment.resources.select(&:vm?).first
           server_summary(server)
           ui.msg("")
 
@@ -79,7 +80,7 @@ class Chef
 
           ui.confirm("Do you really want to delete this server")
 
-          destroy_request = server.destroy
+          destroy_request = deployment.destroy
           ui.msg("Destroy request #{destroy_request.id} submitted.")
           wait_for_request(destroy_request)
           ui.msg("Destroy request complete.")
@@ -87,48 +88,50 @@ class Chef
         end
 
         def list_servers
-          connection.resources.all_resources.select(&:vm?)
+          connection.deployments.all
         end
 
-        def list_catalog_items(entitled)
+        def list_catalog_items(project_id, entitled)
           if entitled
-            connection.catalog.entitled_items
+            connection.catalog.entitled_items(project_id)
           else
             connection.catalog.all_items
           end
         end
 
-        def get_server(instance_id)
-          connection.resources.by_id(instance_id)
+        def get_deployment(deployment_id)
+          connection.deployments.by_id(deployment_id)
+        end
+
+        def get_server(deployment_id)
+          deployment = connection.deployments.by_id(deployment_id)
+          deployment.resources.select(&:vm?).first
         end
 
         def server_summary(server, _columns_with_info = nil)
-          msg_pair("Server ID", server.id)
-          msg_pair("Server Name", server.name)
-          msg_pair("IP Addresses", server.ip_addresses.nil? ? "none" : server.ip_addresses.join(", "))
+          deployment = connection.deployments.by_id(server.deployment_id)
+          msg_pair("Deployment ID", deployment.id)
+          msg_pair("Deployment Name", deployment.name)
+          msg_pair("IP Address", server.ip_address.nil? ? "none" : server.ip_address)
           msg_pair("Status", server.status)
-          msg_pair("Catalog Name", server.catalog_name)
-          msg_pair("Owner IDs", server.owner_ids.empty? ? "none" : server.owner_ids.join(", "))
-          msg_pair("Owner Names", server.owner_names.empty? ? "none" : server.owner_names.join(", "))
+          msg_pair("Owner Names", server.owner_names.empty? ? "none" : server.owner_names)
         end
 
         def request_summary(request)
           ui.msg("")
           msg_pair("Request Status", request.status)
-          msg_pair("Completion State", request.completion_state)
-          msg_pair("Completion Details", request.completion_details)
           ui.msg("")
         end
 
         def catalog_request(options)
           catalog_request = connection.catalog.request(options[:catalog_id])
 
-          catalog_request.cpus          = options[:cpus]
-          catalog_request.memory        = options[:memory]
-          catalog_request.requested_for = options[:requested_for]
-          catalog_request.lease_days    = options[:lease_days]    unless options[:lease_days].nil?
-          catalog_request.notes         = options[:notes]         unless options[:notes].nil?
-          catalog_request.subtenant_id  = options[:subtenant_id]  unless options[:subtenant_id].nil?
+          catalog_request.image_mapping  = options[:image_mapping]
+          catalog_request.flavor_mapping = options[:flavor_mapping]
+          catalog_request.name           = options[:name]
+          catalog_request.project_id     = options[:project_id]
+          catalog_request.version        = options[:version] unless options[:version].nil?
+
           options[:extra_params]&.each do |param|
             catalog_request.set_parameter(param[:key], param[:type], param[:value])
           end

data/lib/chef/knife/vra_catalog_list.rb

@@ -36,6 +36,10 @@ class Chef
           include VraServiceHelpers
         end
 
+        option :project_id,
+          long:        "--project-id",
+          description: "Catalogs are retrieved using the Project ID"
+
         option :entitled,
           long:        "--entitled-only",
           description: "only list entitled vRA catalog entries",
@@ -47,15 +51,14 @@ class Chef
             { label: "Catalog ID",  key: "id" },
             { label: "Name",        key: "name" },
             { label: "Description", key: "description" },
-            { label: "Status",      key: "status", value_callback: method(:format_status_value) },
-            { label: "Subtenant",   key: "subtenant_name" },
+            { label: "Source",      key: "source_name" },
           ]
 
           @sort_by_field = "name"
         end
 
         def query_resource
-          @service.list_catalog_items(config[:entitled])
+          @service.list_catalog_items(config[:project_id], config[:entitled])
         end
 
         def format_status_value(status)

data/lib/chef/knife/vra_server_create.rb

@@ -22,54 +22,46 @@ require "chef/knife"
 require "chef/knife/cloud/server/create_command"
 require "chef/knife/cloud/server/create_options"
 require_relative "cloud/vra_service_options"
+require_relative "cloud/vra_service_helpers"
 
 class Chef
   class Knife
     class Cloud
       class VraServerCreate < ServerCreateCommand
-        include VraServiceHelpers
         include VraServiceOptions
         include ServerCreateOptions
+        include VraServiceHelpers
 
         banner "knife vra server create CATALOG_ID (options)"
 
         deps do
           require_relative "cloud/vra_service"
-          require_relative "cloud/vra_service_helpers"
         end
 
-        option :cpus,
-          long:        "--cpus NUM_CPUS",
-          description: "Number of CPUs the server should have"
-
-        option :node_ssl_verify_mode,
-          long: "--node-ssl-verify-mode [peer|none]",
-          description: "Whether or not to verify the SSL cert for all HTTPS requests when bootstrapping"
-        option :memory,
-          long:        "--memory RAM_IN_MB",
-          description: "Amount of RAM, in MB, the server should have"
+        option :project_id,
+          long:        "--project-id PROJECT_ID",
+          description: "ID of the project"
 
-        option :requested_for,
-          long:        "--requested-for LOGIN",
-          description: "The login to list as the owner of this resource. Will default to the vra_username parameter"
+        option :image_mapping,
+          long:        "--image-mapping IMAGE_MAPPING",
+          description: "Specifies the OS image for the new VM"
 
         option :server_create_timeout,
           long:        "--server-create-timeout SECONDS",
           description: "number of seconds to wait for the server to complete",
           default:     600
 
-        option :subtenant_id,
-          long:        "--subtenant-id ID",
-          description: 'The subtenant ID (a.k.a "business group") to list as the owner of this resource. ' \
-            "Will default to the blueprint subtenant if it exists."
+        option :flavor_mapping,
+          long:        "--flavor-mapping FLAVOR_MAPPING",
+          description: "Specifies the CPU count and RAM for the new VM"
 
-        option :lease_days,
-          long:        "--lease-days NUM_DAYS",
-          description: "Number of days requested for the server lease, provided the blueprint allows this to be specified"
+        option :version,
+          long:        "--version VERSION",
+          description: "Specifies the version of the catalog to be used. By default the latest version will be used."
 
-        option :notes,
-          long:        "--notes NOTES",
-          description: "String of text to be included in the request notes."
+        option :name,
+          long:        "--name NAME",
+          description: "Name for the newly created deployment"
 
         option :extra_params,
           long:        "--extra-param KEY=TYPE:VALUE",
@@ -90,7 +82,7 @@ class Chef
             exit 1
           end
 
-          check_for_missing_config_values!(:cpus, :memory, :requested_for)
+          check_for_missing_config_values!(:name, :flavor_mapping, :image_mapping, :project_id)
 
           validate_extra_params!
         end
@@ -100,22 +92,19 @@ class Chef
 
           @create_options = {
             catalog_id: @name_args.first,
-            cpus: config[:cpus],
-            memory: config[:memory],
-            requested_for: config[:requested_for],
-            subtenant_id: config[:subtenant_id],
-            lease_days: config[:lease_days],
-            notes: config[:notes],
+            project_id: config[:project_id],
+            image_mapping: config[:image_mapping],
+            flavor_mapping: config[:flavor_mapping],
+            version: config[:version],
+            name: config[:name],
             extra_params: extra_params,
-            wait_time: config[:server_create_timeout],
-            refresh_rate: config[:request_refresh_rate],
           }
         end
 
         def before_bootstrap
           super
 
-          config[:chef_node_name] = config[:chef_node_name] ? config[:chef_node_name] : server.name
+          config[:chef_node_name] ||= server.name
           config[:bootstrap_ip_address] = hostname_for_server
         end
 
@@ -139,7 +128,7 @@ class Chef
         end
 
         def hostname_for_server
-          ip_address = server.ip_addresses.first
+          ip_address = server.ip_address
 
           ip_address.nil? ? server.name : ip_address
         end

data/lib/chef/knife/vra_server_delete.rb

@@ -30,7 +30,7 @@ class Chef
         include ServerDeleteOptions
         include VraServiceOptions
 
-        banner "knife vra server delete RESOURCE_ID [RESOURCE_ID] (options)"
+        banner "knife vra server delete DEPLOYMENT_ID [DEPLOYMENT_ID] (options)"
 
         deps do
           require_relative "cloud/vra_service"

data/lib/chef/knife/vra_server_list.rb

@@ -39,10 +39,11 @@ class Chef
 
         def before_exec_command
           @columns_with_info = [
-            { label: "Resource ID",  key: "id" },
-            { label: "Name",         key: "name" },
-            { label: "Status",       key: "status", value_callback: method(:format_status_value) },
-            { label: "Catalog Name", key: "catalog_name" },
+            { label: "Deployment ID", key: "id" },
+            { label: "Name",          key: "name" },
+            { label: "Status",        key: "status", value_callback: method(:format_status_value) },
+            { label: "Owner",         key: "owner" },
+            { label: "Description",   key: "description" },
           ]
 
           @sort_by_field = "name"

data/lib/chef/knife/vra_server_show.rb

@@ -30,7 +30,7 @@ class Chef
         include ServerShowOptions
         include VraServiceOptions
 
-        banner "knife vra server show RESOURCE_ID (options)"
+        banner "knife vra server show DEPLOYMENT_ID (options)"
 
         deps do
           require_relative "cloud/vra_service"
@@ -40,12 +40,12 @@ class Chef
 
         def validate_params!
           if @name_args.empty?
-            ui.error("You must supply a Resource ID for a server to display.")
+            ui.error("You must supply a Deployment ID for a server to display.")
             exit 1
           end
 
           if @name_args.size > 1
-            ui.error("You may only supply one Resource ID.")
+            ui.error("You may only supply one Deployment ID.")
             exit 1
           end
 

data/lib/knife-vrealize/version.rb

@@ -19,5 +19,5 @@
 #
 
 module KnifeVrealize
-  VERSION = "6.0.0"
+  VERSION = "7.0.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: knife-vrealize
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: knife
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: knife-cloud
   requirement: !ruby/object:Gem::Requirement
@@ -36,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: vcoworkflows
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +116,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Chef Infra Knife plugin to interact with VMware vRealize.