morpheus-cli 4.2 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65ef554015f7c79d475689f9b09d7a91e235c7feb992580f588e11c4c2fe36a5
-  data.tar.gz: 787e1ba5b1dbe066f8ab8e1fd47ec93372d9b68f5402ff4bcee3e1e7dbc62cfc
+  metadata.gz: 46d92f279d50a64ebeb6f5c08623f9e54573cbf4855f08f2bfbb6a201b706522
+  data.tar.gz: 19c96eb29f3afc1943d6e52667fac9be0364a8d8e87d9b2d04da13671d2b68c4
 SHA512:
-  metadata.gz: f21d7fef551d46c5e2f9465fdebc59b8b3c801d8a44474a299a2285234672206da64a0e68ca7d3b3f36eb1ee80279477ea1a0fc3b13c7ade10e72cbdde4bb3e8
-  data.tar.gz: 183b260af59171e6f0620864fc428245618506276cd350097396664a5f7609e866f4defcba7dd41f2f87a07ea292af42de57887b23736190c15ca46042977ea8
+  metadata.gz: d7267a3cfbc6052d7963dcda64401c289031b65b12779721361154dfdbf6344195779a8b44d8da5b45a0d52a1b06c5f53cd8a4cf07b300693e23ec71463adaf6
+  data.tar.gz: bca94b7c92c9c420224a5695d05f8f35f89c8211c61c74b3e106b2789439df2a46ab8f7adcee04654655cbff6275fddf5da68408f9691711c25152fcb9636c81

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 4.2
+RUN gem install morpheus-cli -v 4.2.1
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/library_instance_types_interface.rb

@@ -10,21 +10,23 @@ class Morpheus::LibraryInstanceTypesInterface < Morpheus::APIClient
 
   def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/library/instance-types/#{id}"
+    # new URL is available in api 4.2 +
+    # url = "#{@base_url}/api/library/#{id}"
+    url = "#{@base_url}/api/library/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def list(params={})
-    url = "#{@base_url}/api/library/instance-types"
+    url = "#{@base_url}/api/library"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def create(options)
-    url = "#{@base_url}/api/library/instance-types"
+    url = "#{@base_url}/api/library"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
@@ -32,7 +34,7 @@ class Morpheus::LibraryInstanceTypesInterface < Morpheus::APIClient
   end
 
   def update(id, options)
-    url = "#{@base_url}/api/library/instance-types/#{id}"
+    url = "#{@base_url}/api/library/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
@@ -40,14 +42,14 @@ class Morpheus::LibraryInstanceTypesInterface < Morpheus::APIClient
   end
 
   def toggle_featured(id, params={}, payload={})
-    url = "#{@base_url}/api/library/instance-types/#{id}/toggle-featured"
+    url = "#{@base_url}/api/library/#{id}/toggle-featured"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def destroy(id, payload={})
-    url = "#{@base_url}/api/library/instance-types/#{id}"
+    url = "#{@base_url}/api/library/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
@@ -55,7 +57,7 @@ class Morpheus::LibraryInstanceTypesInterface < Morpheus::APIClient
 
   # NOT json, multipart file upload
   def update_logo(id, logo_file)
-    url = "#{@base_url}/api/library/instance-types/#{id}/update-logo"
+    url = "#{@base_url}/api/library/#{id}/update-logo"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}"}
     payload = {}
     payload[:logo] = logo_file

data/lib/morpheus/api/library_layouts_interface.rb

@@ -51,7 +51,9 @@ class Morpheus::LibraryLayoutsInterface < Morpheus::APIClient
   def build_url(instance_type_id=nil, id=nil)
     url = "#{@base_url}/api"
     if instance_type_id
-      url += "/library/instance-types/#{instance_type_id}/layouts"
+      # new URL is available in api 4.2 +
+      # url += "/library/instance-types/#{instance_type_id}/layouts"
+      url += "/library/#{instance_type_id}/layouts"
     else
       url += "/library/layouts"
     end

data/lib/morpheus/api/service_plans_interface.rb

@@ -33,6 +33,12 @@ class Morpheus::ServicePlansInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def activate(id, params={})
+    url = "#{@api_url}/#{id}/activate"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :put, url: url, headers: headers)
+  end
+
   def deactivate(id, params={})
     url = "#{@api_url}/#{id}/deactivate"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/cli/mixins/provisioning_helper.rb

@@ -599,13 +599,16 @@ module Morpheus::Cli::ProvisioningHelper
 
       # add selectable datastores for resource pool
       if options[:select_datastore]
-        service_plan['datastores'] = {'cluster' => [], 'store' => []}
-        selectable_datastores = cloud_datastores_interface.selectable(cloud_id, {'siteId' => group_id, 'resourcePoolId' => resource_pool['id']})
-        ['cluster', 'store'].each do |type|
-          service_plan['datastores'][type] ||= []
-          selectable_datastores[type].reject { |ds| service_plan['datastores'][type].find {|it| it['id'] == ds['id']} }.each { |ds|
-            service_plan['datastores'][type] << ds
-          }
+        begin
+          service_plan['datastores'] = {'cluster' => [], 'store' => []}
+          selectable_datastores = cloud_datastores_interface.selectable(cloud_id, {'siteId' => group_id, 'resourcePoolId' => resource_pool['id']})
+          ['cluster', 'store'].each do |type|
+            service_plan['datastores'][type] ||= []
+            selectable_datastores[type].reject { |ds| service_plan['datastores'][type].find {|it| it['id'] == ds['id']} }.each { |ds|
+              service_plan['datastores'][type] << ds
+            }
+          end
+        rescue => error
         end
 
         if provision_type && provision_type['supportsAutoDatastore']

data/lib/morpheus/cli/service_plans_command.rb

@@ -7,7 +7,7 @@ class Morpheus::Cli::ServicePlanCommand
 
   set_command_name :'service-plans'
 
-  register_subcommands :list, :get, :add, :update, :deactivate
+  register_subcommands :list, :get, :add, :update, :activate, :deactivate
   set_default_subcommand :list
 
   def connect(opts)
@@ -637,6 +637,60 @@ class Morpheus::Cli::ServicePlanCommand
       exit 1
     end
   end
+  
+  def activate(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[plan]")
+      build_common_options(opts, options, [:json, :dry_run, :remote, :auto_confirm])
+      opts.footer = "Activate service plan.\n" +
+          "[plan] is required. Service plan ID, name or code"
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+      return 1
+    end
+
+    begin
+      plan = find_service_plan(args[0])
+
+      if !plan
+        print_red_alert "Service plan #{args[0]} not found"
+        exit 1
+      end
+
+      if plan['active'] == true
+        print_green_success "Service plan #{plan['name']} already actived."
+        return 0
+      end
+
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to activate the service plan '#{plan['name']}'?", options)
+        return 9, "aborted command"
+      end
+
+      @service_plans_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @service_plans_interface.dry.activate(plan['id'], params)
+        return
+      end
+
+      json_response = @service_plans_interface.activate(plan['id'], params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      elsif !options[:quiet]
+        print_green_success "Service plan #{plan['name']} activated"
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
 
   def deactivate(args)
     options = {}

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2"
+    VERSION = "4.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: '4.2'
+  version: 4.2.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler