cloudstack-cli 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.0.5)
+    cloudstack-cli (0.1.0)
       net-ssh (~> 2.6.7)
       rainbow (~> 1.1.4)
       thor (~> 0.18.1)

data/lib/cloudstack-cli/base.rb

@@ -5,8 +5,7 @@ module CloudstackCli
 
     # catch control-c and exit
     trap("SIGINT") {
-      puts
-      puts "bye"
+      puts " bye"
       exit!
     }
 

data/lib/cloudstack-cli/cli.rb

@@ -68,6 +68,9 @@ module CloudstackCli
     desc "network SUBCOMMAND ...ARGS", "Manage networks"
     subcommand "network", Network
 
+    desc "physicalnetwork SUBCOMMAND ...ARGS", "Manage physical networks"
+    subcommand "physicalnetwork", PhysicalNetwork
+
     desc "lb SUBCOMMAND ...ARGS", "Manage load balancing rules"
     subcommand "lb", Lb
 

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

@@ -7,43 +7,33 @@ class Network < CloudstackCli::Base
 
   desc "list", "list networks"
   option :project
-  option :physical, type: :boolean
+  option :account, default: ""
   def list
     project = find_project if options[:project]
-    if options[:physical]
-      networks = client.list_physical_networks
-      if networks.size < 1
-        puts "No networks found"
-      else
-        table = [['Name', 'State', 'ID', 'Zone ID']]
-        networks.each do |network|
-          table << [
-            network["name"],
-            network["state"],
-            network["id"],
-            network["zoneid"] 
-          ]
-        end
-        print_table table
-      end
+
+    networks = []
+    if project
+      networks = client.list_networks(project['id'])
+    else
+      networks = client.list_networks(-1, options[:account] != '' ? options[:account] : nil )
+      networks + client.list_networks(nil, options[:account] != '' ? options[:account] : nil )
+    end
+
+    if networks.size < 1
+      puts "No networks found"
     else
-      networks = client.list_networks(project ? project['id'] : -1)
-      if networks.size < 1
-        puts "No networks found"
-      else
-        table = [["Name", "Displaytext", "Account", "Project", "State", "ID"]]
-        networks.each do |network|
-          table << [
-            network["name"],
-            network["displaytext"],
-            network["account"],
-            network["project"],
-            network["state"],
-            network["id"]
-          ]
-        end
-        print_table table
+      table = [["Name", "Displaytext", "Account", "Project", "State", "ID"]]
+      networks.each do |network|
+        table << [
+          network["name"],
+          network["displaytext"],
+          network["account"],
+          network["project"],
+          network["state"],
+          network["id"]
+        ]
       end
+      print_table table
     end
   end
 

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

@@ -0,0 +1,24 @@
+class PhysicalNetwork < CloudstackCli::Base
+
+  desc "list", "list physical networks"
+  option :project
+  def list
+    project = find_project if options[:project]
+    networks = client.list_physical_networks
+    if networks.size < 1
+      puts "No networks found"
+    else
+      table = [['Name', 'State', 'ID', 'Zone ID']]
+      networks.each do |network|
+        table << [
+          network["name"],
+          network["state"],
+          network["id"],
+          network["zoneid"] 
+        ]
+      end
+      print_table table
+    end
+  end
+
+end

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

@@ -32,13 +32,13 @@ class Server < CloudstackCli::Base
   end
 
   desc "create NAME", "create a server"
-  option :zone, :required => true
-  option :template, :required => true
-  option :offering, :required => true
-  option :networks, :type => :array, :required => true
+  option :zone, required: true
+  option :template, required: true
+  option :offering, required: true
+  option :networks, type: :array, required: true
   option :project
-  option :port_forwarding, :type => :array, :aliases => :pf, :default => [], :description => "public_ip:port"
-  option :interactive, :type => :boolean
+  option :port_forwarding, type: :array, aliases: :pf, default: [], description: "public_ip:port"
+  option :interactive, type: :boolean
   def create(name)
     CloudstackCli::Helper.new(options[:config]).bootstrap_server(
       name,
@@ -51,6 +51,25 @@ class Server < CloudstackCli::Base
     )
   end
 
+  desc "destroy NAME", "destroy a server"
+  option :force, description: "destroy without asking", type: :boolean, aliases: '-f'
+  def destroy(name)
+    server = client.get_server(name)
+    unless server
+      error "Server not found."
+      exit
+    end
+    ask = "Are you sure you want to destroy the following server?\n"
+    ask += "#{server['name']} (#{server['state']})?"
+
+    unless options[:force] == true || yes?(ask)
+      exit  
+    end
+
+    client.destroy_server(server["id"])
+    puts
+  end
+
   desc "bootstrap", "interactive creation of a server with network access"
   def bootstrap
     CloudstackCli::Helper.new(options[:config]).bootstrap_server_interactive()

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

@@ -1,8 +1,14 @@
 class Stack < CloudstackCli::Base
 
 	desc "create STACKFILE", "create a stack of servers"
-  def create(stackfile)
-    # TODO
+  def create(stack_file)
+  	#begin
+      stack = JSON.parse(File.read(stack_file))
+    #rescue Exception => e
+      $stderr.puts "Can't find the stack file #{stack_file}."
+      exit
+    #end
+    	p stack
   end
 
 end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/cloudstack-client/client.rb

@@ -272,6 +272,20 @@ module CloudstackClient
       json['virtualmachine']
     end
 
+    ##
+    # Destroy the server with the specified name.
+    #
+
+    def destroy_server(id)
+      params = {
+          'command' => 'destroyVirtualMachine',
+          'id' => id
+      }
+
+      json = send_async_request(params)
+      json['virtualmachine']
+    end
+
     ##
     # Finds the service offering with the specified name.
 
@@ -468,12 +482,21 @@ module CloudstackClient
     ##
     # Lists all available networks.
 
-    def list_networks(project_id = nil)
+    def list_networks(project_id = nil, account = nil)
       params = {
-          'command' => 'listNetworks',
-          'listall' => true,
+        'command' => 'listNetworks',
+        'listall' => true,
       }
       params['projectid'] = project_id if project_id
+      if account
+        domain = list_accounts({name: account})
+        if domain.size > 0
+          params['account'] = account
+          params['domainid'] = domain.first["domainid"]
+        else
+          puts "Account #{account} not found."
+        end
+      end
       json = send_request(params)
       json['network'] || []
     end

data/lib/cloudstack-client/helper.rb

@@ -4,8 +4,8 @@ module CloudstackClient
       begin
         return YAML::load(IO.read(config_file))
       rescue Exception => e
-        $stderr.puts "Can't find the config file '#{config_file}'"
-        $stderr.puts "Please see https://bitbucket.org/swisstxt/cloudstack-cli under 'Setup'"
+        $stderr.puts "Can't find the config file #{config_file}."
+        $stderr.puts "To create a new configuration file run \"cs setup\"."
         exit
       end
     end

data/test/stack_example.json

@@ -0,0 +1,29 @@
+{
+  "name": "hadoop_cluster_a",
+  "description": "A small hadoop cluster with hbase",
+  "version": "1.0",
+  "servers": [
+    {
+      "name": "zookeeper-a, zookeeper-b, zookeeper-c",
+      "description": "Zookeeper nodes",
+      "template": "rhel-5.6-base",
+      "service": "small",
+      "port_rules": "2181",
+    },
+    {
+      "name": "hadoop-master",
+      "description": "Hadoop master node",
+      "template": "rhel-5.6-base",
+      "service": "large",
+      "networks": "app-net, storage-net",
+      "port_rules": "50070, 50030, 60010",
+    },
+    {
+      "name": "hadoop-worker-a hadoop-worker-b hadoop-worker-c",
+      "description": "Hadoop worker nodes",
+      "template": "rhel-5.6-base",
+      "service": "medium",
+      "port_rules": "50075, 50060, 60030",
+    }
+  ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -115,6 +115,7 @@ files:
 - lib/cloudstack-cli/commands/load_balancer.rb
 - lib/cloudstack-cli/commands/network.rb
 - lib/cloudstack-cli/commands/offering.rb
+- lib/cloudstack-cli/commands/physical_network.rb
 - lib/cloudstack-cli/commands/project.rb
 - lib/cloudstack-cli/commands/publicip.rb
 - lib/cloudstack-cli/commands/router.rb
@@ -130,6 +131,7 @@ files:
 - lib/cloudstack-client/ssh_command.rb
 - lib/cloudstack_cli.rb
 - lib/cloudstack_client.rb
+- test/stack_example.json
 homepage: https://bitbucket.org/swisstxt/cloudstack-cli
 licenses: []
 post_install_message: 
@@ -156,4 +158,5 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: cloudstack-cli CloudStack API client
-test_files: []
+test_files:
+- test/stack_example.json