cloudstack-cli 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9333cd14a9e146a183cc06b9c08cdec221ab090c
-  data.tar.gz: ff4ad2339fe3ad8f8a05bf105e0a5b63ee875404
+  metadata.gz: 0627b894e7b7c1cef8693c8b0b467bb2deaa4cb2
+  data.tar.gz: b48db8f182a2d17717d7a9897ec775f975d0ed10
 SHA512:
-  metadata.gz: b71a5b0fc8600a26c0c1e52ddbdc8e93dd941227e837f8e3edabefed51a6fb52270449c7babe5e01a67dbff570908b4af9cda2eea2d43770b7d40a21743d366e
-  data.tar.gz: 840fe9f4f5fbfeb03030b73432ec632f8a81b0fd9f34b5a95ad5db25642c9b13b54cd401612445310e68649f9947bed91127487ecf493772263af8fa3e4a9c0b
+  metadata.gz: 50f9c65fcee553a3b35a9881e84b52a87a2481bbc9975c3ea66fec608b7bb0c4f1676299ddc16ae5bb813af256ff801387f3ae7395d181b6eedb070717789046
+  data.tar.gz: f084ea2345dd07d0ca976d93d72cd2b13fbef5fd8753215bd97b346a426850b3aa40ca7247407d8b5740e242e8e3f682fc4f9135f701b982b3ade62221da11e7

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: ../cloudstack_client/
   specs:
-    cloudstack_client (1.3.1)
+    cloudstack_client (1.4.0)
 
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.5.0)
-      cloudstack_client (~> 1.3)
+    cloudstack-cli (1.5.1)
+      cloudstack_client (~> 1.4)
       thor (~> 0.19)
 
 GEM

data/cloudstack-cli.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency('rake', '~> 11.1')
 
-  gem.add_dependency('cloudstack_client', '~> 1.3')
+  gem.add_dependency('cloudstack_client', '~> 1.4')
   gem.add_dependency('thor', '~> 0.19')
 end

data/lib/cloudstack-cli/commands/compute_offer.rb

@@ -33,6 +33,7 @@ class ComputeOffer < CloudstackCli::Base
   option :domain
   option :ha, type: :boolean
   option :tags
+  option :hosttags
   def create(name)
     resolve_domain
     options[:name] = name
@@ -73,12 +74,14 @@ class ComputeOffer < CloudstackCli::Base
 
   no_commands do
     def print_compute_offerings(offerings, totals = true)
-      table = [%w(Name Displaytext Domain ID)]
+      table = [%w(Name Displaytext Domain Tags HostTags ID)]
       offerings.each do |offering|
         table << [
           offering["name"],
           offering["displaytext"],
           offering["domain"],
+          offering["tags"],
+          offering["hosttags"],
           offering["id"]
         ]
       end

data/lib/cloudstack-cli/commands/stack.rb

@@ -22,18 +22,19 @@ class Stack < CloudstackCli::Base
             name: name,
             displayname: instance["decription"],
             zone: instance["zone"] || stack["zone"],
+            project: stack["project"],
             template: instance["template"],
             iso: instance["iso"] ,
             offering: instance["offering"],
             networks: load_string_or_array(instance["networks"]),
-            project: stack["project"],
+            ip_network_list: instance["ip_network_list"],
             disk_offering: instance["disk_offering"],
             size: instance["disk_size"],
             group: instance["group"] || stack["group"],
             keypair: instance["keypair"] || stack["keypair"],
-            ip_address: instance["ip_address"],
+            ip_address: instance["ip_address"]
           })
-          
+
           jobs << {
             id: client.deploy_virtual_machine(
               vm_options_to_params,
@@ -123,6 +124,7 @@ class Stack < CloudstackCli::Base
     def string_to_array(string)
       string ? string.gsub(', ', ',').split(',') : nil
     end
-  end
+
+  end # no_commands
 
 end

data/lib/cloudstack-cli/option_resolver.rb

@@ -13,7 +13,11 @@ module CloudstackCli
         say "Error: Template or ISO is required.", :red
         exit 1
       end
-      resolve_networks
+      if options[:ip_network_list]
+        resolve_ip_network_list
+      else
+        resolve_networks
+      end
     end
 
     def resolve_zone
@@ -86,8 +90,6 @@ module CloudstackCli
       end
       networks.compact!
       if networks.empty?
-        #unless default_network = client.list_networks(project_id: options[:project_id]).find {
-        #  |n| n['isdefault'] == true }
         unless default_network = client.list_networks(project_id: options[:project_id]).first
           say "Error: No default network found.", :red
           exit 1
@@ -98,6 +100,31 @@ module CloudstackCli
       options
     end
 
+    def resolve_ip_network_list
+      network_list = []
+      available_networks = network = client.list_networks(
+        zone_id: options[:zone_id],
+        project_id: options[:project_id]
+      )
+      if options[:ip_network_list]
+        options[:ip_network_list].each do |item|
+          unless network = available_networks.find { |n| n['name'] == item["name"] }
+            say "Error: Network '#{name}' not found.", :red
+            exit 1
+          end
+          item.delete("name")
+          network_list << {networkid: network["id"]}.merge(item) # rescue nil
+        end
+      end
+      network_list.compact!
+      if network_list.empty?
+        say "Error: IP network list can't be empty.", :red
+        exit 1
+      end
+      options[:ip_to_network_list] = network_list
+      options
+    end
+
     def resolve_iso
       if options[:iso]
         iso = false

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/test/stack_example.yml

@@ -6,18 +6,18 @@
   project: "Playground"
   group: "my_web_stack"
   servers:
-    -
-      name: "web-001, web-002"
+    - name: "web-001, web-002"
       description: "Web nodes"
       template: "CentOS-7-x86_64"
       offering: "1cpu_1gb"
       networks: "M_PLAY"
       port_rules: ":80, :443"
-    -
-      name: "db-001"
+    - name: "db-001"
       description: "PostgreSQL Master"
       iso: "CentOS-7.0-x64"
       disk_offering: "Perf Storage"
       disk_size: "5"
       offering: "2cpu_4gb"
-      networks: "M_PLAY"
+      ip_network_list:
+        - name: "M_PLAY"
+          ip: 10.101.64.42

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement