brightbox-cli 0.14.1 → 0.15.0

data/lib/brightbox-cli/commands/images-update.rb

@@ -18,6 +18,9 @@ module Brightbox
     c.desc "Image description"
     c.flag [:d, "description"]
 
+    c.desc "Image Usernmae"
+    c.flag [:u, "username"]
+
     c.action do |global_options,options,args|
       img_id = args.shift
       raise "You must specify the image to update as the first argument" unless img_id =~ /^img-/
@@ -33,6 +36,7 @@ module Brightbox
       params[:arch]               = options[:a] if options[:a]
       params[:source]             = options[:s] if options[:s]
       params[:description]        = options[:d] if options[:d]
+      params[:username]           = options[:u] if options[:u]
 
       params[:compatibility_mode] = true if options[:m] == "compatibility"
       params[:compatibility_mode] = false if options[:m] == "virtio"

data/lib/brightbox-cli/commands/servers-create.rb

@@ -26,6 +26,9 @@ module Brightbox
     c.desc "Don't base64 encode the user data"
     c.switch [:e, :no_base64]
 
+    c.desc "Server groups to place server in - comma delimited list"
+    c.flag [:g, "server-groups"]
+
     c.action do |global_options, options, args|
 
       if args.empty?
@@ -83,20 +86,28 @@ module Brightbox
         raise "User data too big (>16k)" if user_data.size > 16 * 1024
       end
 
+      # Split server groups into array of identifiers (or empty array)
+      server_groups = ServerGroup.find_or_call(options[:g].to_s.split(/,\s*/)) do |id|
+        raise "Couldn't find server #{id}"
+      end
+
       msg = "Creating #{options[:i] > 1 ? options[:i] : 'a'} #{type.handle} (#{type.id})"
       msg << " server#{options[:i] > 1 ? 's' : ''} with image #{image.name.strip} (#{image.id})"
       msg << " in zone #{zone.handle} (#{zone})" if zone
+      msg << " in groups #{server_groups.map(&:id).join(", ")}" unless server_groups.empty?
       msg << " with %.2fk of user data" % (user_data.size / 1024.0) if user_data
       info msg
 
-      servers = Server.create_servers( options[:i], {
-          :image_id => image.id,
-          :flavor_id => type.id,
-          :zone_id => zone.to_s,
-          :name => options[:n],
-          :user_data => user_data
-        }
-      )
+      params = {
+        :image_id      => image.id,
+        :flavor_id     => type.id,
+        :zone_id       => zone.to_s,
+        :name          => options[:n],
+        :user_data     => user_data,
+        :server_groups => server_groups.map(&:id)
+      }
+
+      servers = Server.create_servers options[:i], params
       render_table(servers, global_options)
     end
   end

data/lib/brightbox-cli/commands/servers-list.rb

@@ -3,9 +3,6 @@ module Brightbox
   arg_name '[server-id...]'
   command [:list] do |c|
     c.action do |global_options,options,args|
-
-      Type.cache_all!
-      Zone.cache_all!
       if args.empty?
         servers = Server.find(:all)
       else

data/lib/brightbox-cli/commands/servers-show.rb

@@ -7,48 +7,12 @@ module Brightbox
 
       raise "You must specify servers to show" if args.empty?
 
-      servers = Server.find_or_call(args) do |id|
+      servers = DetailedServer.find_or_call(args) do |id|
         raise "Couldn't find server #{id}"
       end
 
-      rows = []
-      servers.each do |s|
-        o = s.to_row
-        if s.server_type.exists?
-          o[:type] = s.server_type.id
-          o[:type_handle] = s.server_type.handle
-          o[:type_name] = s.server_type.name
-          o[:ram] = s.server_type.ram
-          o[:cores] = s.server_type.cores
-          o[:disk] = s.server_type.disk.to_i
-        end
-
-        if s.image.exists?
-          o[:image_name] = s.image.name
-          o[:arch] = s.image.arch
-        end
-        interfaces = s.interfaces
-        o[:private_ips] = interfaces.collect { |i| i['ipv4_address'] }.join(", ")
-        o[:ipv6_address] = interfaces.collect { |i| i['ipv6_address'] }.join(", ")
-
-        o[:cloud_ip_ids] = s.cloud_ips.collect { |i| i['id'] }.join(", ")
-        o[:cloud_ips] = s.cloud_ips.collect { |i| i['public_ip'] }.join(", ")
-        o[:snapshots] = s.snapshots.collect { |i| i['id'] }.join(", ")
-        rows << o
-      end
-
-      display_options = {
-        :vertical => true,
-        :fields => [:id, :status, :name, :created_at, :deleted_at,
-          :zone, :type, :type_name, :type_handle, :ram, :cores,
-          :disk, :image, :image_name, :private_ips, :cloud_ips, :ipv6_address,
-          :cloud_ip_ids, :hostname, :public_hostname, :snapshots
-        ]
-      }
-
-      table_opts = global_options.merge(display_options)
-      render_table(rows, table_opts)
-
+      table_opts = global_options.merge(:vertical => true)
+      render_table(servers, table_opts)
     end
   end
 end

data/lib/brightbox-cli/commands/servers-stop.rb

@@ -4,7 +4,7 @@ module Brightbox
   command [:stop] do |c|
 
     c.action do |global_options,options,args|
-      
+
       raise "You must specify servers to stop" if args.empty?
 
       servers = Server.find_or_call(args) do |id|

data/lib/brightbox-cli/detailed_server.rb

@@ -0,0 +1,43 @@
+module Brightbox
+  class DetailedServer < Server
+    def to_row
+      row_attributes = attributes
+      if server_type
+        row_attributes[:type] = server_type['id']
+        row_attributes[:type_handle] = server_type['handle']
+        row_attributes[:type_name] = server_type['name']
+        row_attributes[:ram] = server_type['ram']
+        row_attributes[:cores] = server_type['cores']
+        row_attributes[:disk] = server_type['disk'].to_i
+      end
+
+      if image
+        row_attributes[:image_name] = image.name
+        row_attributes[:arch] = image.arch
+      end
+
+      row_attributes[:private_ips] = interfaces.collect { |i| i['ipv4_address'] }.join(", ")
+      row_attributes[:ipv6_address] = interfaces.collect { |i| i['ipv6_address'] }.join(", ")
+
+      row_attributes[:cloud_ip_ids] = cloud_ips.collect { |i| i['id'] }.join(", ")
+      row_attributes[:cloud_ips] = cloud_ips.collect { |i| i['public_ip'] }.join(", ")
+      row_attributes[:snapshots] = snapshots.collect { |i| i['id'] }.join(", ")
+
+      if server_groups
+        row_attributes[:server_groups] = server_groups.map { |sg| sg['id']}.join(", ")
+      end
+
+
+      row_attributes
+    end
+
+    def self.default_field_order
+      [:id, :status, :name, :created_at, :deleted_at,
+        :zone, :type, :type_name, :type_handle, :ram, :cores,
+        :disk, :image, :image_name, :private_ips, :cloud_ips, :ipv6_address,
+        :cloud_ip_ids, :hostname, :public_hostname, :snapshots,
+        :server_groups
+      ]
+    end
+  end
+end

data/lib/brightbox-cli/detailed_server_group.rb

@@ -0,0 +1,13 @@
+module Brightbox
+  class DetailedServerGroup < ServerGroup
+    def to_row
+      row_attributes = super
+      row_attributes[:firewall_policy] = firewall_policy && firewall_policy.id
+      row_attributes
+    end
+
+    def self.default_field_order
+      [:id, :name, :servers, :firewall_policy, :description]
+    end
+  end
+end

data/lib/brightbox-cli/firewall_policy.rb

@@ -0,0 +1,32 @@
+module Brightbox
+  class FirewallPolicy < Api
+
+    def self.create(options)
+      new(conn.firewall_policies.create(options))
+    end
+
+    def self.get(id)
+      conn.firewall_policies.get(id)
+    end
+
+    def self.all
+      conn.firewall_policies
+    end
+
+    def attributes
+      t = fog_model.attributes
+      t[:name] = name
+      t[:description] = description
+      t[:server_group] = server_group_id
+      t
+    end
+
+    def to_row
+      attributes
+    end
+
+    def self.default_field_order
+      [:id, :server_group, :name]
+    end
+  end
+end

data/lib/brightbox-cli/firewall_rule.rb

@@ -0,0 +1,39 @@
+require "pp"
+module Brightbox
+  class FirewallRule < Api
+    attr_writer :attributes
+
+    def self.create(options)
+      new(conn.firewall_rules.create(options))
+    end
+
+    def self.get(id)
+      conn.firewall_rules.get(id)
+    end
+
+    def attributes
+      t = @attributes || fog_model.attributes
+      t[:sport] = t[:source_port]
+      t[:dport] = t[:destination_port]
+      t[:firewall_policy] = t[:firewall_policy_id]
+      t[:icmp_type] = t[:icmp_type_name]
+      t
+    end
+
+    def to_row
+      attrs = attributes.dup
+      [:protocol,:source,:sport, :destination, :dport, :icmp_type].each do |key|
+        attrs[key] = attributes[key] || '-'
+      end
+      attrs
+    end
+
+    def ret_val(attributes,key)
+      attributes[key] || "-"
+    end
+
+    def self.default_field_order
+      [:id, :protocol,:source, :sport,:destination, :dport, :icmp_type]
+    end
+  end
+end

data/lib/brightbox-cli/firewall_rules.rb

@@ -0,0 +1,26 @@
+module Brightbox
+  class FirewallRules
+    def self.from_policy(firewall_policy)
+      rules = firewall_policy.rules
+      rules.map do |rule|
+        fwr = FirewallRule.new('fwr')
+        fwr.attributes = symbolize_keys(rule)
+        fwr
+      end
+    end
+
+    def self.symbolize_keys(object) #:nodoc:
+      modify_keys(object) do |key|
+        key.is_a?(String) ? key.to_sym : key
+      end
+    end
+
+    def self.modify_keys(object, &modifier) #:nodoc:
+      object.inject({}) do |result, (key, value)|
+        new_key   = modifier.call(key)
+        result.merge! new_key => value
+      end
+    end
+
+  end
+end

data/lib/brightbox-cli/images.rb

@@ -15,7 +15,7 @@ module Brightbox
     end
 
     def self.default_field_order
-      [:id, :owner, :type, :created_on, :status, :size, :name]
+      [:id, :owner, :type, :created_on, :status, :size, :username,:name]
     end
 
     def update options
@@ -34,6 +34,7 @@ module Brightbox
       else
         o[:status] = status
       end
+      o[:username] = username
       o[:arch] = arch
       o[:name] = name.to_s + " (#{arch})"
       o[:owner] = owner_id

data/lib/brightbox-cli/server_groups.rb

@@ -0,0 +1,64 @@
+module Brightbox
+  class ServerGroup < Api
+
+    def self.all
+      conn.server_groups
+    end
+
+    def self.get(id)
+      conn.server_groups.get(id)
+    end
+
+    def self.create(options)
+      new(conn.server_groups.create(options))
+    end
+
+    def self.default_field_order
+      [:id, :server_count, :name]
+    end
+
+    def firewall_policy
+      FirewallPolicy.all.detect do |policy|
+        policy.server_group_id == self.id
+      end
+    end
+
+    def update(options)
+      self.class.conn.update_server_group(id, options)
+      self.reload
+      self
+    rescue Excon::Errors::BadRequest => e
+      raise Conflict, JSON.parse(e.response.body)['error']['details']
+    end
+
+    def destroy
+      fog_model.destroy
+    end
+
+    def attributes
+      fog_model.attributes
+    end
+
+    def to_row
+      o = attributes
+      o[:servers] = server_string
+      o[:server_count] = server_count
+      o
+    end
+
+    def server_count
+      server_ids.respond_to?(:size) ? server_ids.size : 0
+    end
+
+    def server_string
+      server_ids.respond_to?(:join) ? server_ids.join(" ") : ""
+    end
+
+    def server_ids
+      if attributes["servers"]
+        @server_ids ||= attributes["servers"].collect { |s| s["id"] }
+      end
+    end
+
+  end
+end

data/lib/brightbox-cli/servers.rb

@@ -31,30 +31,20 @@ module Brightbox
 
     def destroy
       fog_model.destroy
-    rescue Excon::Errors::Conflict => e
-      raise Conflict, "Cannot delete server #{id}"
     end
 
     def activate_console
       self.class.conn.activate_console_server id
     end
 
-    def server_type
-      @server_type ||= (Type.new(flavor_id) if flavor_id)
-    end
-
-    def image
-      @image ||= (Image.new(image_id) if image_id)
-    end
-
     def attributes
       a = fog_model.attributes
-      a[:image] = image
+      a[:image] = image_id
       a[:created_at] = created_at
       a[:created_on] = fog_model.created_at.strftime("%Y-%m-%d")
-      a[:type] = server_type
+      a[:type] = server_type['handle']
       a[:status] = fog_model.state
-      a[:zone] = Zone.new(zone_id) if zone_id
+      a[:zone] = zone && zone['handle']
       a[:hostname] = hostname
       a[:public_hostname] = public_hostname unless cloud_ips.empty?
       a
@@ -79,4 +69,6 @@ module Brightbox
       "public.#{hostname}"
     end
   end
+
+
 end

data/lib/brightbox-cli/vendor/fog/Rakefile

@@ -98,6 +98,7 @@ end
 
 task :nuke do
   Fog.providers.each do |provider|
+    next if ['Vmfusion'].include?(provider)
     begin
       compute = Fog::Compute.new(:provider => provider)
       for server in compute.servers
@@ -106,6 +107,17 @@ task :nuke do
       end
     rescue
     end
+    begin
+      dns = Fog::DNS.new(:provider => provider)
+      for zone in dns.zones
+        for record in zone.records
+          record.destroy rescue nil
+        end
+        Formatador.display_line("[#{provider}] destroying zone #{zone.identity}")
+        zone.destroy rescue nil
+      end
+    rescue
+    end
   end
 end
 
@@ -191,8 +203,10 @@ task :changelog do
   changelog << ''
 
   require 'multi_json'
-  github_data = MultiJson.decode(Excon.get('http://github.com/api/v2/json/repos/show/geemus/fog').body)
-  data = github_data['repository'].reject {|key, value| !['forks', 'open_issues', 'watchers'].include?(key)}
+  github_repo_data = MultiJson.decode(Excon.get('http://github.com/api/v2/json/repos/show/geemus/fog').body)
+  data = github_repo_data['repository'].reject {|key, value| !['forks', 'open_issues', 'watchers'].include?(key)}
+  github_collaborator_data = MultiJson.decode(Excon.get('http://github.com/api/v2/json/repos/show/geemus/fog/collaborators').body)
+  data['collaborators'] = github_collaborator_data['collaborators'].length
   rubygems_data = MultiJson.decode(Excon.get('https://rubygems.org/api/v1/gems/fog.json').body)
   data['downloads'] = rubygems_data['downloads']
   stats = []
@@ -236,6 +250,7 @@ task :changelog do
         'Lincoln Stoll',
         'Luqman Amjad',
         'nightshade427',
+        'Patrick Debois',
         'Wesley Beary'
       ].include?(committer)
       next