cloudstack-cli 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.2.0)
+    cloudstack-cli (0.2.1)
       thor (~> 0.18.1)
 
 GEM

data/README.md

@@ -55,6 +55,8 @@ An example stackfile looks like this
       "description": "Web Application Stack",
       "version": "1.0",
       "zone": "DC-BIE-1",
+      "group": "my_web_stack",
+      "keypair": "mykeypair",
       "servers": [
         {
           "name": "web-d1, web-d2",
@@ -67,7 +69,9 @@ An example stackfile looks like this
         {
           "name": "db-01",
           "description": "PostgreSQL Master",
-          "template": "CentOS-6.4-x64-v1.2",
+          "iso": "CentOS-6.4-x86_64-swisstxt-v15",
+          "disk_offering": "Perf Storage",
+          "disk_size": "5",
           "offering": "2cpu_4gb",
           "networks": "server_network, storage_network"
         }

data/lib/cloudstack-cli/base.rb

@@ -18,12 +18,13 @@ module CloudstackCli
     end
 
     no_commands do  
-      def client
+      def client(opts = {})
         @config ||= CloudstackClient::ConnectionHelper.load_configuration(options[:config])
         @client ||= CloudstackClient::Connection.new(
           @config[:url],
           @config[:api_key],
-          @config[:secret_key]
+          @config[:secret_key],
+          opts
         )
       end
 

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

@@ -33,44 +33,22 @@ class Server < CloudstackCli::Base
   end
 
   desc "create NAME", "create a server"
-  option :template, desc: "name of the template"
-  option :iso, desc: "name of the iso"
-  option :offering, required: true
-  option :networks, type: :array
-  option :zone
-  option :project
-  option :port_rules, type: :array,
+  option :template, aliases: '-t', desc: "name of the template"
+  option :iso, desc: "name of the iso", desc: "name of the iso template"
+  option :offering, aliases: '-o', required: true, desc: "computing offering name"
+  option :networks, aliases: '-n', type: :array, desc: "network names"
+  option :zone, aliases: '-z', desc: "availability zone name"
+  option :project, aliases: '-p', desc: "project name"
+  option :port_rules, aliases: '-pr', type: :array,
     default: [],
     desc: "Port Forwarding Rules [public_ip]:port ..."
-  option :disk_offering
+  option :disk_offering, desc: "disk offering - data disk for template, root disk for iso"
   option :disk_size, desc: "disk size in GB"
   option :hypervisor, desc: "only used for iso deployments, default: vmware"
   option :keypair, desc: "the name of the ssh keypair to use"
+  option :group, desc: "group name"
   def create(name)
-    if project = find_project
-      project_id = project["id"]
-    end 
-    server = client.get_server(name, project_id)
-    unless server
-      say "Create server #{name}...", :yellow
-      server = client.create_server(
-       options.merge({name: name})
-      )
-      puts
-      say "Server #{name} has been created.", :green
-      client.wait_for_server_state(server["id"], "Running")
-      say "Server #{name} is running.", :green
-    else
-      say "Server #{name} already exists.", :yellow
-      # TODO: check status of server
-    end
-
-    if options[:port_rules] && options[:port_rules].size > 0
-      invoke "port_rule:create", name,
-        project: options[:project],
-        network: options[:networks].first,
-        rules: options[:port_rules]
-    end
+    bootstrap_server(options.merge({name: name}))
   end
 
   desc "destroy NAME [NAME2 ..]", "destroy a server"
@@ -85,8 +63,8 @@ class Server < CloudstackCli::Base
         say "Server #{server_name} not found.", :red
       else
         ask = "Destroy #{server_name} (#{server['state']})?"
-        if options[:force] == true || yes?(ask)
-          say "Destroying #{server_name} "
+        if options[:force] == true || yes?(ask, :yellow)
+          say "destroying #{server_name} "
           client.destroy_server(server["id"])
           puts  
         end

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

@@ -10,13 +10,19 @@ class Stack < CloudstackCli::Base
       server["name"].split(', ').each_with_index do |name, i|
         threads << Thread.new(i) {
           bootstrap_server(
-            name,
-            server["zone"] || stack["zone"],
-            server["template"],
-            server["offering"],
-            server["networks"] ? server["networks"].split(', ') : nil,
-            server["port_rules"] ? server["port_rules"].split(', ') : nil,
-            stack["project"]
+            name: name,
+            displayname: server["decription"],
+            zone: server["zone"] || stack["zone"],
+            template: server["template"],
+            iso: server["iso"] ,
+            offering: server["offering"],
+            networks: server["networks"] ? server["networks"].split(', ') : nil,
+            port_rules: server["port_rules"] ? server["port_rules"].split(', ') : nil,
+            project: stack["project"],
+            disk_offering: server["disk_offering"],
+            disk_size: server["disk_size"],
+            group: server["group"] || stack["group"],
+            keypair: server["keypair"] || stack["keypair"]
           )
         }
       end
@@ -37,6 +43,7 @@ class Stack < CloudstackCli::Base
       server["name"].split(', ').each {|name| servers << name}
     end
     say "Destroy stack #{stack["name"]}...", :yellow
+    puts
     invoke "server:destroy", servers, project: stack["project"], force: options[:force]
   end
 

data/lib/cloudstack-cli/helper.rb

@@ -11,50 +11,38 @@ module CloudstackCli
       number < 0 ? 0 : number
     end
 
-    def bootstrap_server(name, zone, template, offering, networks, pf_rules = [], project = nil)
-      if project = client.get_project(project)
+    def bootstrap_server(args = {})
+      if args[:project] && project = client(quiet: true).get_project(args[:project])
         project_id = project["id"]
         project_name = project['name']
       end
-      server = client.get_server(name, project_id)
+      server = client(quiet: true).get_server(args[:name], project_id)
       unless server
-        say "Create server #{name}..."
-        server = client.create_server(
-         name: name, 
-         offering: offering,
-         template: template,
-         zone: zone,
-         networks: networks,
-         project: project_name
-        )
-        puts
+        say "Create server #{args[:name]}...", :yellow
+        server = client.create_server(args)
         say "Server #{server["name"]} has been created.", :green
         client.wait_for_server_state(server["id"], "Running")
         say "Server #{server["name"]} is running.", :green
       else
-        say "Server #{name} already exists.", :yellow
+        say "Server #{args[:name]} already exists (#{server['state']}).", :yellow
       end
 
-      if pf_rules && pf_rules.size > 0
-        puts
+      if args[:port_rules] && args[:port_rules].size > 0
         frontendip = nil
-        pf_rules.each do |pf_rule|
+        args[:port_rules].each do |pf_rule|
           ip = pf_rule.split(":")[0]
           if ip != ''
             ip_addr = client.get_public_ip_address(ip)
           else
             ip_addr = frontendip ||= client.associate_ip_address(
-              client.get_network(networks[0], project_id)["id"]
+              server["nic"].first["networkid"]
             )
           end
           port = pf_rule.split(":")[1]
-          puts
-          say "Create port forwarding rule #{ip}:#{port} ", :yellow
+          say "Create port forwarding rule #{ip_addr['ipaddress']}:#{port} for server #{args[:name]}.", :yellow
           client.create_port_forwarding_rule(ip_addr["id"], port, 'TCP', port, server["id"])
-          puts
         end
       end
-      puts
     end
 
     def bootstrap_server_interactive

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/cloudstack-client/client.rb

@@ -20,11 +20,12 @@ module CloudstackClient
       include Object.const_get("CloudstackClient").const_get(module_name)
     end
 
-    def initialize(api_url, api_key, secret_key)
+    def initialize(api_url, api_key, secret_key, opts = {})
       @api_url = api_url
       @api_key = api_key
       @secret_key = secret_key
       @use_ssl = api_url.start_with? "https"
+      @verbose = !opts[:quiet]
     end
 
     ##
@@ -91,12 +92,12 @@ module CloudstackClient
         json = send_request(params)
         status = json['jobstatus']
 
-        print "."
+        print "." if @verbose
 
         if status == 1 then
           return json['jobresult']
         elsif status == 2 then
-          print "\n"
+          puts
           puts "Request failed (#{json['jobresultcode']}): #{json['jobresult']}"
           exit 1
         end

data/lib/cloudstack-client/commands/network.rb

@@ -2,6 +2,20 @@ module CloudstackClient
 
 	module Network
 
+    ##
+    # Finds the network with the specified name.
+
+    def networkid_to_name(id, project_id=nil)
+      params = {
+          'command' => 'listNetworks',
+          'id' => id
+      }
+      params['projectid'] = project_id if project_id
+      json = send_request(params)
+
+      json['network'] ? json['network'].first['name'] : nil
+    end
+
 		##
     # Finds the network with the specified name.
 

data/lib/cloudstack-client/commands/server.rb

@@ -206,6 +206,8 @@ module CloudstackClient
       params['hypervisor'] = (args[:hypervisor] || 'vmware') if iso
       params['keypair'] = args[:keypair] if args[:keypair]
       params['size'] = args[:disk_size] if args[:disk_size]
+      params['group'] = args[:group] if args[:group]
+      params['displayname'] = args[:displayname] if args[:displayname]
 
       json = send_async_request(params)
       json['virtualmachine']

data/lib/cloudstack-client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/test/stack_example.json

@@ -4,9 +4,10 @@
   "version": "1.0",
   "zone": "BIEL_CU01",
   "project": "Playground",
+  "group": "my_web_stack",
   "servers": [
     {
-      "name": "web-01, web-02",
+      "name": "web-001, web-002",
       "description": "Web nodes",
       "template": "CentOS-6.4-x64-v1.2",
       "offering": "1cpu_1gb",
@@ -14,9 +15,11 @@
       "port_rules": ":80, :443"
     },
     {
-      "name": "db-01",
+      "name": "db-001",
       "description": "PostgreSQL Master",
-      "template": "CentOS-6.4-x64-v1.2",
+      "iso": "CentOS-6.4-x86_64-swisstxt-v15",
+      "disk_offering": "Perf Storage",
+      "disk_size": "5",
       "offering": "2cpu_4gb",
       "networks": "M_PLAY"
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: