hpcloud 2.0.0

data/lib/hpcloud/commands/routers/add.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc "routers:add <name>", "Add a router."
+      long_desc <<-DESC
+  Add a new router to your network with the specified name.  If a gateway is not specified, the first network that has router_external set to true is used (typically 'Ext-Net'.
+
+Examples:
+  hpcloud routers:add routerone   # Create a new router named 'routerone'
+  hpcloud routers:add routertwo -g Ext-Net   # Create a new router named 'routertwo' with the specified network as a gateway
+      DESC
+      method_option :gateway,
+                    :type => :string, :aliases => '-g',
+                    :desc => 'Network to use as external router.'
+      method_option :adminstateup, :default => true,
+                    :type => :boolean, :aliases => '-u',
+                    :desc => 'Administrative state.'
+      CLI.add_common_options
+      define_method "routers:add" do |name|
+        cli_command(options) {
+          router = Routers.new.unique(name)
+          router.name = name
+          netty = Routers.parse_gateway(options[:gateway])
+          if netty.nil?
+            router.external_gateway_info = {}
+          else
+            router.external_gateway_info = { 'network_id' => netty.id }
+          end
+          router.admin_state_up = options[:adminstateup]
+          router.save
+          unless netty.nil?
+            unless netty.subnets.nil?
+              unless netty.subnets.empty?
+                sub_command("add router interface for subnet") {
+                  Connection.instance.network.add_router_interface(router.id, netty.subnets, nil)
+                }
+              end
+            end
+          end
+          @log.display "Created router '#{name}' with id '#{router.id}'."
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/routers/interface/add.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc "routers:interface:add <router> <subnet_or_port>", "Add an interface to a router."
+      long_desc <<-DESC
+  Add an interface to your router with the specified subnet or port.
+
+Examples:
+  hpcloud routers:interface:add trout subnetty # Add an interface to the subnet 'subnetty'
+  hpcloud routers:interface:add trout proto    # Add an interface to the port 'porto'
+      DESC
+      CLI.add_common_options
+      define_method "routers:interface:add" do |name, subnet_or_port|
+        cli_command(options) {
+          router = Routers.new.get(name)
+          subnet_id = nil
+          port_id = nil
+          subby = Subnets.new.get(subnet_or_port)
+          if subby.is_valid?
+            subnet_id = subby.id
+            newinterface = subnet_id
+          else
+            porty = Ports.new.get(subnet_or_port)
+            unless porty.is_valid?
+              @log.fatal "Cannot find a subnet or port matching '#{subnet_or_port}'."
+            end
+            port_id = porty.id
+            newinterface = port_id
+          end
+
+          Connection.instance.network.add_router_interface(router.id, subnet_id, port_id)
+          @log.display "Created router interface '#{name}' to '#{subnet_or_port}'."
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/routers/interface/remove.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map %w(routers:interface:rm routers:interface:delete routers:interface:del) => 'routers:interface:remove'
+
+      desc "routers:interface:remove <router_name_or_id> <subnet_or_port>", "Remove router interface."
+      long_desc <<-DESC
+  Remove router port or subnet router interface from router.
+
+Examples:
+  hpcloud routers:interface:remove trout puerto   # Delete port 'puerto' from 'trout'
+  hpcloud routers:interface:remove trout netty    # Delete subnet 'netty' from 'trout'
+
+Aliases: routers:interface:rm, routers:interface:delete, routers:interface:del
+      DESC
+      CLI.add_common_options
+      define_method "routers:interface:remove" do |name, subnet_or_port|
+        cli_command(options) {
+          router = Routers.new.get(name)
+          subnet_id = nil
+          port_id = nil
+          word = ""
+          subby = Subnets.new.get(subnet_or_port)
+          if subby.is_valid?
+            subnet_id = subby.id
+            oldinterface = subnet_id
+            word = "subnet"
+          else
+            porty = Ports.new.get(subnet_or_port)
+            unless porty.is_valid?
+              @log.fatal "Cannot find a subnet or port matching '#{subnet_or_port}'."
+            end
+            port_id = porty.id
+            oldinterface = port_id
+            word = "port"
+          end
+
+          Connection.instance.network.remove_router_interface(router.id, subnet_id, port_id)
+          @log.display "Removed #{word} interface '#{subnet_or_port}' from '#{name}'."
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/routers/remove.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map %w(routers:rm routers:delete routers:del) => 'routers:remove'
+
+      desc "routers:remove name_or_id [name_or_id ...]", "Remove a router (specified by name or ID)."
+      long_desc <<-DESC
+  Remove router by specifying their names or ID. You may specify more than one router name or ID on a command line.
+
+Examples:
+  hpcloud routers:remove blue red   # Delete the router 'blue' and 'red'
+  hpcloud routers:remove 39e36520   # Delete the router with ID 39e36520
+
+Aliases: routers:rm, routers:delete, routers:del
+      DESC
+      CLI.add_common_options
+      define_method "routers:remove" do |name_or_id, *name_or_ids|
+        cli_command(options) {
+          name_or_ids = [name_or_id] + name_or_ids
+          routers = Routers.new
+          name_or_ids.each{ |name|
+            sub_command("removing router") {
+              router = routers.get(name, false)
+              router.destroy
+              @log.display "Removed router '#{router.name}'."
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/routers/update.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc "routers:update <name>", "Update the specified router."
+      long_desc <<-DESC
+  Update an existing router with new administrative state or gateway infomration.  If you do not want an external network, use the gateway option with an empty string.
+
+Examples:
+  hpcloud routers:update trout -u # Update router 'trout' administrative state
+  hpcloud routers:update c14411d7 -u # Update router 'c14411d7' administrative state
+      DESC
+      method_option :gateway,
+                    :type => :string, :aliases => '-g',
+                    :desc => 'Network to use as external router.'
+      method_option :adminstateup,
+                    :type => :boolean, :aliases => '-u',
+                    :desc => 'Administrative state.'
+      CLI.add_common_options
+      define_method "routers:update" do |name|
+        cli_command(options) {
+          router = Routers.new.get(name)
+          unless options[:adminstateup].nil?
+            if options[:adminstateup] == true
+              router.admin_state_up = true
+            else
+              router.admin_state_up = "false"
+            end
+          end
+          router.external_gateway_info = nil
+          unless options[:gateway].nil?
+            netty = Routers.parse_gateway(options[:gateway])
+            if netty.nil?
+              router.external_gateway_info = {}
+            else
+              router.external_gateway_info = { 'network_id' => netty.id }
+            end
+          end
+          router.save
+          @log.display "Updated router '#{name}'."
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/routers.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'hpcloud/commands/routers/add.rb'
+require 'hpcloud/commands/routers/remove.rb'
+require 'hpcloud/commands/routers/update.rb'
+require 'hpcloud/commands/routers/interface/add.rb'
+require 'hpcloud/commands/routers/interface/remove.rb'
+require 'hpcloud/routers'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map 'routers:list' => 'routers'
+    
+      desc 'routers [name_or_id ...]', "List the available routers."
+      long_desc <<-DESC
+  Lists all the routers that are associated with the account. The list begins with identifier and contains name, status, administrative state, and gateways.  Optionally, you can filter the list by specifying name or ID.
+
+Examples:
+  hpcloud routers       # List all routers
+  hpcloud routers c14411d7     # List the details for routers with id `c14411d7`
+  hpcloud routers testo # List the details for routers named `testo`
+
+Aliases: routers:list
+      DESC
+      CLI.add_report_options
+      CLI.add_common_options
+      def routers(*arguments)
+        columns = [ "id", "name", "admin_state_up", "status", "external_gateway_info" ]
+        cli_command(options) {
+          routers = Routers.new
+          if routers.empty?
+            @log.display "You currently have no routers, use `#{selfname} routers:add <name>` to create one."
+          else
+            ray = routers.get_array(arguments)
+            if ray.empty?
+              @log.display "There are no routers that match the provided arguments"
+            else
+              Tableizer.new(options, columns, ray).print
+            end
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/securitygroups/add.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc "securitygroups:add <name> <description>", "Add a security group."
+      long_desc <<-DESC
+  Add a new security group by specifying a name and a description. Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud securitygroups:add mysecgroup "seg group desc"  # Add new security group `mysecgroup` with description `seg group desc`
+      DESC
+      CLI.add_common_options
+      define_method "securitygroups:add" do |sec_group_name, sg_desc|
+        cli_command(options) {
+          if SecurityGroups.new.get(sec_group_name).is_valid? == true
+            @log.fatal "Security group '#{sec_group_name}' already exists."
+          end
+
+          security_group = SecurityGroupHelper.new(Connection.instance)
+          security_group.name = sec_group_name
+          security_group.description = sg_desc
+          if security_group.save == true
+            @log.display "Created security group '#{sec_group_name}' with id '#{security_group.id}'."
+          else
+            @log.fatal security_group.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/securitygroups/remove.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map %w(securitygroups:rm securitygroups:delete securitygroups:del) => 'securitygroups:remove'
+
+      desc "securitygroups:remove name_or_id [name_or_id ...]", "Remove a security group or groups."
+      long_desc <<-DESC
+  Remove existing security groups by name or ID. Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud securitygroups:remove group1 group2 # Remove the security groups `group1` and `group2`
+  hpcloud securitygroups:remove 41fb5504      # Remove the security group with the ID `41fb5504`
+
+Aliases: securitygroups:rm, securitygroups:delete, securitygroups:del
+      DESC
+      CLI.add_common_options
+      define_method "securitygroups:remove" do |name_or_id, *name_or_ids|
+        cli_command(options) {
+          name_or_ids = [name_or_id] + name_or_ids
+          securitygroups = SecurityGroups.new.get(name_or_ids, false)
+          securitygroups.each { |securitygroup|
+            sub_command("removing security group") {
+              if securitygroup.is_valid?
+                securitygroup.destroy
+                @log.display "Removed security group '#{securitygroup.name}'."
+              else
+                @log.error securitygroup.cstatus
+              end
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/securitygroups/rules/add.rb

@@ -0,0 +1,126 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map %w(securitygroups:rules:authorize) => 'securitygroups:rules:add'
+
+      desc "securitygroups:rules:add <sec_group_name> <ip_protocol>", "Add a rule to the security group."
+      long_desc <<-DESC
+  Add a rule to the security group. If <ip_protocol> is specified as 'icmp', then port range may be omitted.  If <cidr> is not specified, then the address defaults to '0.0.0.0/0'. To allow communications within a given security group, you must specify a source group while creating a rule. Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud securitygroups:rules:add mysggroup icmp                                   # Set the default port range to -1..-1
+  hpcloud securitygroups:rules:add mysggroup tcp -p 22..22                          # Set the default cidr to `0.0.0.0/0`
+  hpcloud securitygroups:rules:add mysggroup tcp -p 80..80 -c "111.111.111.111/1"   # Set the cidr to `111.111.111.111/1`
+  hpcloud securitygroups:rules:add mysggroup tcp -p 80..80 -g "mysourcegroup"       # Set the source group to `mysourcegroup`
+
+Aliases: securitygroups:rules:authorize
+      DESC
+      method_option :port_range,
+                    :type => :string, :aliases => '-p',
+                    :desc => 'Specify a port range like 22..22'
+      method_option :cidr,
+                    :type => :string, :aliases => '-c',
+                    :desc => 'Specify a cidr ip range like 0.0.0.0/0'
+      method_option :source_group,
+                    :type => :string, :aliases => '-g',
+                    :desc => 'Specify a source group.'
+      method_option :direction,
+                    :type => :string, :default => 'egress',
+                    :desc => 'Direction egress or ingress.'
+      method_option :ethertype,
+                    :type => :string, :default => 'IPv4',
+                    :desc => 'Ether type must be IPv6 or IPv4.'
+      CLI.add_common_options
+      define_method "securitygroups:rules:add" do |sec_group_name, ip_protocol|
+        cli_command(options) {
+          src_group_id = nil
+          port_range = Range.new(-1, -1)
+          port_range_str = options[:port_range]
+          cidr = options[:cidr]
+          src_group = options[:source_group]
+          direction = options[:direction]
+          ethertype = options[:ethertype]
+
+          # either a source group or a cidr value can be specified
+          if (src_group && cidr)
+            @log.fatal "You can either specify a source group or an ip address, not both.", :incorrect_usage
+          end
+
+          unless (direction == 'egress' || direction == 'ingress')
+            @log.fatal "Direction must be egress or ingress.", :incorrect_usage
+          end
+          unless (ethertype == 'IPv6' || ethertype == 'IPv4')
+            @log.fatal "Ethertype must be IPv6 or IPv4.", :incorrect_usage
+          end
+          unless (ip_protocol == 'tcp' || ip_protocol == 'udp' || ip_protocol == 'icmp')
+            @log.fatal "Protocol must be tcp, udp or icmp.", :incorrect_usage
+          end
+          # incase of icmp it defaults to -1..-1 and 0.0.0.0/0
+          unless ip_protocol == 'icmp'
+            if port_range_str.nil?
+              @log.fatal "You have to specify a port range for any ip protocol other than 'icmp'.", :incorrect_usage
+            end
+          end
+
+          # resolve port range
+          unless port_range_str.nil?
+            port_range = port_range_str.split('..').inject { |s,e| s.to_i..e.to_i }
+          end
+
+          security_group = SecurityGroups.new.get(sec_group_name)
+          if security_group.is_valid? == false
+            @log.fatal "You don't have a security group '#{sec_group_name}'.", :not_found
+          end
+
+          # if a source group is specified, get its id
+          if src_group
+            source_group = Connection.instance.network.security_groups.select {|srg| srg.name == src_group}.first
+            if (source_group && source_group.name == src_group)
+              src_group_id = source_group.id
+            else
+              @log.fatal "You don't have a source security group '#{src_group}'.", :not_found
+            end
+          end
+
+          options = {
+            :protocol => ip_protocol,
+            :ethertype => ethertype
+          }
+          unless ip_protocol == 'icmp'
+            options[:port_range_min] = port_range.begin
+            options[:port_range_max] = port_range.end
+          end
+          options[:remote_ip_prefix] = cidr unless cidr.nil?
+          options[:remote_group_id] = src_group_id unless src_group_id.nil?
+
+          # create the security group rule
+          response = Connection.instance.network.create_security_group_rule(security_group.id, direction, options)
+          rule_id = response.body["security_group_rule"]["id"]
+          @log.display "Created rule '#{rule_id}' for security group '#{sec_group_name}'."
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/securitygroups/rules/remove.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map %w(securitygroups:rules:rm securitygroups:rules:revoke securitygroups:rules:delete securitygroups:rules:del) => 'securitygroups:rules:remove'
+
+      desc "securitygroups:rules:remove rule_id [rule_id...]", "Remove security group rules."
+      long_desc <<-DESC
+  Remove the specified security group rules.  More than one rule may be specified on the command line.
+
+Examples:
+  hpcloud securitygroups:rules:remove 6686fc56  # Remove the rule `6686fc56`
+  hpcloud securitygroups:rules:remove 6686fc56 2ffc3a4c # Remove the rule `6686fc56` and `2ffc3a4c`
+
+Aliases: securitygroups:rules:rm, securitygroups:rules:revoke, securitygroups:rules:delete, securitygroups:rules:del
+      DESC
+      CLI.add_common_options
+      define_method "securitygroups:rules:remove" do |*rule_ids|
+        cli_command(options) {
+          rule_ids.each { |rule_id|
+            sub_command("removing security group rule") {
+              Connection.instance.network.delete_security_group_rule(rule_id)
+              @log.display "Removed rule '#{rule_id}'."
+            }
+          }
+        }
+      end
+    end
+  end
+end