cloudstack-cli 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b75da05246b3ab3ac85f5ca8e93a28db01f8968
-  data.tar.gz: fc2d98e9c509876350509db6da5b5e7ab3b900b2
+  metadata.gz: 1fc85400b51baea8a039a7d3ff78dd81057bc733
+  data.tar.gz: 850b702b9158cb5f016d90f71207172d7f5dee15
 SHA512:
-  metadata.gz: 573c55dfed55ed68409424ef04562a9cd0dca835d23a458ce031c3f5fc0653fc87326f05cfd45c18e76ccbdb409dba6a90a1a5098f4c779ff81065514d50c804
-  data.tar.gz: 22dd3887d463b7b3e08792b1396ec08002ba65bf1a94d9bec2090f72776a64a6b03630cd4dc6c5dd363281d195550cceb991e1677c11b2bf6fe02935c2e6a982
+  metadata.gz: ceb5a646a675bbd3f49bd27b772d1aad9cc3fa9ffa44130069619af7f8eefbe611036ff2b72257ce71aa6b96815b3019e3e1803005cdbb910991febc326817a5
+  data.tar.gz: 195edfdec98780452c0a121f9902cd1540169fcb35a2fab348b2c9ce20ec922b6a0f57f00a9ee21bc55ab6f5a75765514506c09b91bd7147830867c000ef8ff8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../cloudstack_client/
   specs:
-    cloudstack_client (1.4.1)
+    cloudstack_client (1.4.3)
 
 PATH
   remote: .
@@ -13,7 +13,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (11.1.2)
+    rake (11.2.0)
     thor (0.19.1)
 
 PLATFORMS
@@ -22,7 +22,7 @@ PLATFORMS
 DEPENDENCIES
   cloudstack-cli!
   cloudstack_client!
-  rake (~> 11.1)
+  rake (~> 11.2)
 
 BUNDLED WITH
-   1.12.0
+   1.12.4

data/cloudstack-cli.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w(lib)
   gem.rdoc_options  = %w[--line-numbers --inline-source]
 
-  gem.add_development_dependency('rake', '~> 11.1')
+  gem.add_development_dependency('rake', '~> 11.2')
 
   gem.add_dependency('cloudstack_client', '~> 1.4')
   gem.add_dependency('thor', '~> 0.19')

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

@@ -1,49 +1,52 @@
 class Stack < CloudstackCli::Base
 
-  desc "create STACKFILE", "create a stack of VMs"
+  desc "create STACKFILE", "create a stack of VM's"
+  option :limit, type: :array, aliases: '-l',
+    desc: "Limit on specific server names."
   option :skip_forwarding_rules, default: false,
     type: :boolean, aliases: '-s',
     desc: "Skip creation of port forwarding rules."
   def create(stackfile)
     stack = parse_file(stackfile)
     project_id = find_project_by_name(stack["project"])
-
     say "Create stack #{stack["name"]}...", :green
     jobs = []
     stack["servers"].each do |instance|
       string_to_array(instance["name"]).each do |name|
-        server = client.list_virtual_machines(name: name, project_id: project_id).first
-        if server
-          say "VM #{name} (#{server["state"]}) already exists.", :yellow
-          jobs << {
-            id: 0,
-            name: "Create VM #{name}",
-            status: 1
-          }
-        else
-          options.merge!({
-            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"]),
-            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"]
-          })
-          jobs << {
-            id: client.deploy_virtual_machine(
-              vm_options_to_params,
-              {sync: true}
-            )['jobid'],
-            name: "Create VM #{name}"
-          }
+        if options[:limit].include?(name)
+          server = client.list_virtual_machines(name: name, project_id: project_id).first
+          if server
+            say "VM #{name} (#{server["state"]}) already exists.", :yellow
+            jobs << {
+              id: 0,
+              name: "Create VM #{name}",
+              status: 1
+            }
+          else
+            options.merge!({
+              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"]),
+              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"]
+            })
+            jobs << {
+              id: client.deploy_virtual_machine(
+                vm_options_to_params,
+                {sync: true}
+              )['jobid'],
+              name: "Create VM #{name}"
+            }
+          end
         end
       end
     end
@@ -54,20 +57,17 @@ class Stack < CloudstackCli::Base
       jobs = []
       stack["servers"].each do |instance|
         string_to_array(instance["name"]).each do |name|
-          if port_rules = string_to_array(instance["port_rules"])
+          if options[:limit].include?(name) && port_rules = string_to_array(instance["port_rules"])
             server = client.list_virtual_machines(name: name, project_id: project_id).first
             create_port_rules(server, port_rules, false).each_with_index do |job_id, index|
-              jobs << {
-                id: job_id,
-                name: "Create port forwarding rules (#{port_rules[index]}) for VM #{name}"
-              }
+              job_name = "Create port forwarding rules (#{port_rules[index]}) for VM #{name}"
+              jobs << {id: job_id, name: job_name}
             end
           end
         end
       end
       watch_jobs(jobs)
     end
-
     say "Finished.", :green
   end
 
@@ -82,12 +82,21 @@ class Stack < CloudstackCli::Base
     type: :boolean,
     default: false,
     aliases: '-E'
+  option :limit, type: :array, aliases: '-l',
+    desc: "Limit on specific server names."
   def destroy(stackfile)
     stack = parse_file(stackfile)
     project_id = find_project_by_name(stack["project"])
     servers = []
     stack["servers"].each do |server|
-      string_to_array(server["name"]).each {|name| servers << name}
+      string_to_array(server["name"]).each do |name|
+        servers << name if options[:limit].include?(name)
+      end
+    end
+
+    if servers.size == 0
+      say "No servers in stack selected.", :yellow
+      exit
     end
 
     if options[:force] || yes?("Destroy the following VM #{servers.join(', ')}? [y/N]:", :yellow)

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

@@ -102,15 +102,13 @@ class VirtualMachine < CloudstackCli::Base
     end
 
     vm_options_to_params
-    say "Start deploying virtual machine#{ "s" if names.size > 1 }...", :green
+    say "Start deploying virtual machine#{"s" if names.size > 1}...", :green
     jobs = names.map do |name|
-      if virtual_machine = client.list_virtual_machines(name: name, project_id: options[:project_id]).first
+      if virtual_machine = client.list_virtual_machines(
+        name: name, project_id: options[:project_id]
+        ).first
         say "virtual machine #{name} (#{virtual_machine["state"]}) already exists.", :yellow
-        job = {
-          id: 0,
-          name: "Create virtual machine #{name}",
-          status: 1
-        }
+        job = {id: 0, name: "Create virtual machine #{name}", status: 1}
       else
         job = {
           id: client.deploy_virtual_machine(options.merge(name: name), {sync: true})['jobid'],

data/lib/cloudstack-cli/helper.rb

@@ -166,37 +166,63 @@ module CloudstackCli
     end
 
     def create_port_rules(server, port_rules, async = true)
-      frontendip = nil
+      frontendip_id = nil
       jobs = []
       client.verbose = async
       project_id = server['projectid'] || nil
       port_rules.each do |pf_rule|
-        ip = pf_rule.split(":")[0]
-        if ip != ''
-          ip_addr = client.get_public_ip_address(ip, project_id)
-          unless ip_addr
-            say "Error: IP #{ip} not found.", :red
+        pf_rule = pf_rule_to_object(pf_rule)
+        if pf_rule[:ipaddress]
+          pub_ip = client.list_public_ip_addresses(
+            network_id: get_server_default_nic(server)["networkid"],
+            project_id: project_id,
+            ipaddress: pf_rule[:ipaddress]
+          )
+          ip_addr = pub_ip.find { |addr| addr['ipaddress'] == pf_rule[:ipaddress]} if pub_ip
+          if ip_addr
+            frontendip = ip_addr['id']
+          else
+            say "Error: IP #{pf_rule[:ipaddress]} not found.", :red
             next
           end
-        else
-          ip_addr = frontendip ||= client.associate_ip_address(
-            network_id: server["nic"].first["networkid"]
-          )["ipaddress"]
         end
-        port = pf_rule.split(":")[1]
-        args = {
-          ipaddressid: ip_addr["id"],
-          publicport: port,
-          privateport: port,
-          protocol: 'TCP',
-          virtualmachineid: server["id"]
-        }
-        if async
-          say "Create port forwarding rule #{ip_addr['ipaddress']}:#{port} for server #{server["name"]}.", :yellow
-          client.create_port_forwarding_rule(args)
-          return
+
+        # check if there is already an existing rule
+        rules = client.list_port_forwarding_rules(
+          networkid: get_server_default_nic(server)["networkid"],
+          ipaddressid: frontendip_id,
+          projectid: project_id
+        )
+        existing_pf_rules = rules.find do |rule|
+          # remember matching address for additional rules
+          frontendip_id = rule['ipaddressid'] if rule['virtualmachineid'] == server['id']
+
+          rule['virtualmachineid'] == server['id'] &&
+          rule['publicport'] == pf_rule[:publicport] &&
+          rule['privateport'] == pf_rule[:privateport] &&
+          rule['protocol'] == pf_rule[:protocol]
+        end
+
+        if existing_pf_rules
+          say "Port forwarding rule on port #{pf_rule[:privateport]} for VM #{server["name"]} already exists.", :yellow
         else
-          jobs << client.create_port_forwarding_rule(args, {sync: true})['jobid']
+          unless frontendip_id
+            frontendip_id = client.associate_ip_address(
+              network_id: get_server_default_nic(server)["networkid"],
+              project_id: project_id
+            )['ipaddress']['id']
+          end
+          args = pf_rule.merge({
+            ipaddressid: frontendip_id,
+            virtualmachineid: server["id"]
+          })
+          if async
+            say "Create port forwarding rule #{pf_rule[:ipaddress]}:#{port} for VM #{server["name"]}.", :yellow
+            client.create_port_forwarding_rule(args)
+            return
+          else
+            jobs << client.create_port_forwarding_rule(args, {sync: true})['jobid']
+          end
         end
       end
       jobs
@@ -267,57 +293,21 @@ module CloudstackCli
       end
     end
 
-    ##
-    # Finds the public ip for a server
-
-    def get_server_public_ip(server, cached_rules=nil)
-      return nil unless server
-
-      # find the public ip
-      nic = get_server_default_nic(server) || {}
-      if nic['type'] == 'Virtual'
-        ssh_rule = get_ssh_port_forwarding_rule(server, cached_rules)
-        ssh_rule ? ssh_rule['ipaddress'] : nil
-      else
-        nic['ipaddress']
-      end
-    end
-
-    ##
-    # Gets the SSH port forwarding rule for the specified server.
-
-    def get_ssh_port_forwarding_rule(server, cached_rules=nil)
-      rules = cached_rules || client.list_port_forwarding_rules(project_id: server["projectid"]) || []
-      rules.find_all { |r|
-        r['virtualmachineid'] == server['id'] &&
-            r['privateport'] == '22'&&
-            r['publicport'] == '22'
-      }.first
-    end
-
-    ##
-    # Returns the fully qualified domain name for a server.
-
-    def get_server_fqdn(server)
-      return nil unless server
-
-      nic = get_server_default_nic(server) || {}
-      networks = client.list_networks(project_id: server['projectid']) || {}
-
-      id = nic['networkid']
-      network = networks.select { |net|
-        net['id'] == id
-      }.first
-      return nil unless network
-
-      "#{server['name']}.#{network['networkdomain']}"
-    end
-
     def get_server_default_nic(server)
       server['nic'].each do |nic|
         return nic if nic['isdefault']
       end
     end
 
+    def pf_rule_to_object(pf_rule)
+      pf_rule = pf_rule.split(":")
+      {
+        ipaddress: (pf_rule[0] == '' ? nil : pf_rule[0]),
+        privateport: pf_rule[1],
+        publicport: (pf_rule[2] || pf_rule[1]),
+        protocol: (pf_rule[3] || 'tcp').downcase
+      }
+    end
+
   end
 end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: cloudstack_client
   requirement: !ruby/object:Gem::Requirement