morpheus-cli 5.5.1.4 → 5.5.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Dockerfile +1 -1
- data/lib/morpheus/cli/commands/price_sets_command.rb +15 -4
- data/lib/morpheus/cli/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8637acf5e4ce4a0673114edf18f3b69604574905bf6507272411efb1abd6c684
|
4
|
+
data.tar.gz: 5cc836f09c1aa1cf164d5e7ae8fb3fa9a793cfbff0192543f45fe313404226ac
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c4adf8fb42bfe890394b8c988144ad9153f70e0ff1e4d2159b71557c14360b0b3dd1a11aff94409a8b4bbb61b17c27af5a6ebd61ff484182fd85812c5e0d5b0e
|
7
|
+
data.tar.gz: '09af6071b1536a08fad258e3ff01330916a6e7a7c655359618d7f2ce9f00f24879b451a70cfd4ebf32498e7a048423addf9af472873fdcd5236ea04730d4fd3d'
|
data/Dockerfile
CHANGED
@@ -193,7 +193,7 @@ class Morpheus::Cli::PriceSetsCommand
|
|
193
193
|
end
|
194
194
|
end
|
195
195
|
opts.on('-t', "--type [TYPE]", String, "Price set type") do |val|
|
196
|
-
if ['fixed', 'compute_plus_storage', 'component'].include?(val)
|
196
|
+
if ['fixed', 'compute_plus_storage', 'component','load_balancer','snapshot','virtual_image','software_or_service'].include?(val)
|
197
197
|
params['type'] = val
|
198
198
|
else
|
199
199
|
raise_command_error "Unrecognized price set type #{val}"
|
@@ -268,7 +268,7 @@ class Morpheus::Cli::PriceSetsCommand
|
|
268
268
|
end
|
269
269
|
|
270
270
|
# type
|
271
|
-
params['type'] ||= Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => 'Price Set Type', 'selectOptions' => [{'name' => 'Everything', 'value' => 'fixed'}, {'name' => 'Compute + Storage', 'value' => 'compute_plus_storage'}, {'name' => 'Component', 'value' => 'component'}], 'required' => true, 'description' => 'Price Set Type.'}],options[:options],@api_client,{}, options[:no_prompt])['type']
|
271
|
+
params['type'] ||= Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => 'Price Set Type', 'selectOptions' => [{'name' => 'Everything', 'value' => 'fixed'}, {'name' => 'Compute + Storage', 'value' => 'compute_plus_storage'}, {'name' => 'Component', 'value' => 'component'}, {'name' => 'Load Balancer', 'value' => 'load_balancer'},{'name' => 'Snapshot', 'value' => 'snapshot'},{'name' => 'Virtual Image', 'value' => 'virtual_image'},{'name' => 'Software / Service', 'value' => 'software_or_service'}], 'required' => true, 'description' => 'Price Set Type.'}],options[:options],@api_client,{}, options[:no_prompt])['type']
|
272
272
|
if params['type'].nil?
|
273
273
|
print_red_alert "Type is required"
|
274
274
|
exit 1
|
@@ -491,7 +491,12 @@ class Morpheus::Cli::PriceSetsCommand
|
|
491
491
|
end
|
492
492
|
|
493
493
|
def price_set_type_label(type)
|
494
|
-
price_set_types[type]
|
494
|
+
price_set_type = price_set_types[type]
|
495
|
+
if price_set_type.nil?
|
496
|
+
type.capitalize
|
497
|
+
else
|
498
|
+
price_set_type[:label]
|
499
|
+
end
|
495
500
|
end
|
496
501
|
|
497
502
|
def price_type_label(type)
|
@@ -503,7 +508,9 @@ class Morpheus::Cli::PriceSetsCommand
|
|
503
508
|
'storage' => 'Disk Only (per GB)',
|
504
509
|
'datastore' => 'Datastore (per GB)',
|
505
510
|
'platform' => 'Platform',
|
506
|
-
'software' => 'Software'
|
511
|
+
'software' => 'Software',
|
512
|
+
'load_balancer' => 'Load Balancer',
|
513
|
+
'load_balancer_virtual_server' => 'Load Balancer Virtual Server'
|
507
514
|
}[type] || type.capitalize
|
508
515
|
end
|
509
516
|
|
@@ -516,6 +523,10 @@ class Morpheus::Cli::PriceSetsCommand
|
|
516
523
|
'fixed' => {:label => 'Everything', :requires => ['fixed'], :allows => ['platform', 'software']},
|
517
524
|
'compute_plus_storage' => {:label => 'Compute + Storage', :requires => ['compute', 'storage'], :allows => ['platform', 'software']},
|
518
525
|
'component' => {:label => 'Component', :requires => ['memory', 'cores', 'storage'], :allows => ['platform', 'software']},
|
526
|
+
'load_balancer' => {:label => 'Load Balancer', :requires => ['load_balancer'], :allows => ['load_balancer_virtual_server']},
|
527
|
+
'snapshot' => {:label => 'Snapshot', :requires => ['storage'], :allows => ['storage', 'datastore']},
|
528
|
+
'virtual_image' => {:label => 'Virtual Image', :requires => ['storage'], :allows => []},
|
529
|
+
'software_or_service' => {:label => 'Software / Service', :requires => ['software'], :allows => []},
|
519
530
|
}
|
520
531
|
end
|
521
532
|
|
data/lib/morpheus/cli/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: morpheus-cli
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.5.1.
|
4
|
+
version: 5.5.1.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- David Estes
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2022-
|
14
|
+
date: 2022-09-06 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: bundler
|