hpcloud 2.0.0

data/lib/hpcloud/commands/acl.rb

@@ -0,0 +1,63 @@
+# 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/acl/grant'
+require 'hpcloud/commands/acl/revoke'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc 'acl <object/container>', "View the ACL for an object or container."
+      long_desc <<-DESC
+  View the access control list (ACL) for a container or object. Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud acl :my_container/my_file.txt         # Display the ACL for the object 'my_file.txt'
+  hpcloud acl :my_container                     # Display the ACL for the container 'my_container'
+  hpcloud acl :my_container -z region-a.geo-1  # Display the ACL for the container 'my_container' for availability zone `region-a.geo-1`
+      DESC
+      CLI.add_report_options
+      CLI.add_common_options
+      def acl(name, *names)
+        cli_command(options) {
+          names = [name] + names
+
+          ray = []
+          names.each { |name|
+            resource = ResourceFactory.create(Connection.instance.storage, name)
+            if resource.container_head
+              ray << resource.to_hash()
+            else
+              @log.error resource.cstatus
+            end
+          }
+          keys =  [ "public", "readers", "writers", "public_url"]
+          if ray.empty?
+            @log.display "There are no resources that match the provided arguments"
+          else
+            Tableizer.new(options, keys, ray).print
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/addresses/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
+
+      map %w(addresses:allocate) => 'addresses:add'
+
+      desc "addresses:add", "Allocate a new public IP address."
+      long_desc <<-DESC
+  Add or allocate a new public IP address from the pool of available IP addresses.  If a network is not specified, the first external network found will be used.
+
+Examples:
+  hpcloud addresses:add # Add a new public IP address to external network
+  hpcloud addresses:add -n netty # Add a new IP address to `netty`
+
+Aliases: addresses:allocate
+      DESC
+      method_option :network,
+                    :type => :string, :aliases => '-n',
+                    :desc => 'Name or id of the network associated with this IP.'
+      method_option :port,
+                    :type => :string, :aliases => '-p',
+                    :desc => 'Name or id of the port associated with this IP.'
+      method_option :fixed_ip,
+                    :type => :string,
+                    :desc => 'Fixed IP address to associate with this IP.'
+      method_option :floating_ip,
+                    :type => :string,
+                    :desc => 'Floating IP to assign.'
+      CLI.add_common_options
+      define_method "addresses:add" do
+        cli_command(options) {
+          address = FloatingIpHelper.new(Connection.instance)
+          address.set_network(options[:network])
+          address.port = options[:port]
+          address.fixed_ip = options[:fixed_ip]
+          address.floating_ip = options[:floating_ip]
+          if address.save
+            @log.display "Created a public IP address '#{address.ip}'."
+          else
+            @log.fatal address.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/addresses/associate.rb

@@ -0,0 +1,63 @@
+# 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 'addresses:attach' => 'addresses:associate'
+
+      desc "addresses:associate <ip_or_id> <port_name_or_id>", "Associate a public IP address to a port."
+      long_desc <<-DESC
+  Associate an existing and unassigned public IP address, to the specified port.  Optionally, you can specify an availability.
+
+Examples:
+  hpcloud addresses:associate 111.111.111.111 myport  # Associate the address `111.111.111.111` to port `myport`
+      DESC
+      CLI.add_common_options
+      define_method "addresses:associate" do |ip_or_id, port_name_or_id|
+        cli_command(options) {
+          port = Ports.new.get(port_name_or_id)
+          if port.is_valid? == false
+            @log.fatal port.cstatus
+          end
+
+          address = FloatingIps.new.get(ip_or_id)
+          if address.is_valid? == false
+            @log.fatal address.cstatus
+          end
+
+          if address.port.nil? == false
+            if address.port == port.id
+              @log.display "The IP address '#{ip_or_id}' is already associated with '#{port_name_or_id}'."
+            else
+              @log.fatal "The IP address '#{ip_or_id}' is in use by another port '#{address.port}'.", :conflicted
+            end
+          else
+            address.port = port.id
+            address.associate
+            @log.display "Associated address '#{ip_or_id}' to port '#{port_name_or_id}'."
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/addresses/disassociate.rb

@@ -0,0 +1,58 @@
+# 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 'addresses:detach' => 'addresses:disassociate'
+
+      desc "addresses:disassociate ip_or_id [ip_or_id ...]", "Disassociate any port associated to the public IP address."
+      long_desc <<-DESC
+  Disassociate any port associated to the public IP address. The public IP address is not removed or released to the pool. Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud addresses:disassociate 111.111.111.111 127.0.0.1 # Disassociate IP addresses `111.111.111.111` and `127.0.0.1` from their ports
+  hpcloud addresses:disassociate f01b27f3 # Disassociate the address with the ID  '9709'
+      DESC
+      CLI.add_common_options
+      define_method "addresses:disassociate" do |ip_or_id, *ip_or_ids|
+        cli_command(options) {
+          addresses = FloatingIps.new
+          ip_or_ids = [ip_or_id] + ip_or_ids
+          ip_or_ids.each { |ip_or_id|
+            address = addresses.get(ip_or_id)
+            if address.is_valid? == false
+              @log.error address.cstatus
+            else
+              if address.port.nil?
+                @log.display "You don't have any port associated with address '#{ip_or_id}'."
+              else
+                address.port = nil
+                @log.display "Disassociated address '#{ip_or_id}' from any port."
+              end
+            end
+          }
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/addresses/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(addresses:rm addresses:delete addresses:release addresses:del) => 'addresses:remove'
+
+      desc "addresses:remove ip_or_id [ip_or_id ...]", "Remove or release a public IP address."
+      long_desc <<-DESC
+  Remove or release a previously allocated public IP address. Any server instances that were associated to this address are disassociated. You may specify one ore more address IPs or IDs on the command line.  Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud addresses:remove 111.111.111.111 # Remove IP address '111.111.111.111'
+  hpcloud addresses:remove a5bd6680 c80dfe05 # Remove addresses with the IDs 'a5bd6680' and 'c80dfe05'
+
+Aliases: addresses:rm, addresses:delete, addresses:release, addresses:del
+      DESC
+      CLI.add_common_options
+      define_method "addresses:remove" do |ip, *ips|
+        cli_command(options) {
+          addresses = FloatingIps.new
+          ips = [ip] + ips
+          ips.each { |ip_or_id|
+            address = addresses.get(ip_or_id)
+            if address.is_valid? == false
+              @log.error address.cstatus
+            else
+              address.disassociate
+              address.destroy
+              @log.display "Removed address '#{ip_or_id}'."
+            end
+          }
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/addresses.rb

@@ -0,0 +1,63 @@
+# 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/addresses/add'
+require 'hpcloud/commands/addresses/remove'
+require 'hpcloud/commands/addresses/associate'
+require 'hpcloud/commands/addresses/disassociate'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map 'addresses:list' => 'addresses'
+
+      desc "addresses [ip_or_id ...]", "Display list of available addresses."
+      long_desc <<-DESC
+  List the available addresses for your account. You may filter the addresses listed by specifying one or more IPs or IDs on the command line.  Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud addresses                            # List addresses
+  hpcloud addresses 127.0.0.2                  # List address information for IP address 127.0.0.2
+  hpcloud addresses -z az-2.region-a.geo-1     # List addresses for availability zone `az-2.region-a.geo-1`
+
+Aliases: addresses:list
+      DESC
+      CLI.add_report_options
+      CLI.add_common_options
+      def addresses(*arguments)
+        cli_command(options) {
+          addresses = FloatingIps.new
+          if addresses.empty?
+            @log.display "You currently have no public IP addresses, use `#{selfname} addresses:add` to create one."
+          else
+            ray = addresses.get_array(arguments)
+            if ray.empty?
+              @log.display "There are no IP addresses that match the provided arguments"
+            else
+              Tableizer.new(options, FloatingIpHelper.get_keys(), ray).print
+            end
+          end
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# 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 "cdn:containers:add name [name ...]", "Add containers to the CDN."
+      long_desc <<-DESC
+  Add existing containers from your storage account to the CDN. Container names can be specified with or without the preceding colon: 'my_container' or ':my_container'. Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud cdn:containers:add :tainer1 :tainer2                    # Add the containers`tainer1` and `tainer2` to the CDN
+  hpcloud cdn:containers:add :my_cdn_container -z region-a.geo-1  # Add the container `my_cdn_container` to the CDN in the  availability zone `region-a.geo`
+      DESC
+      CLI.add_common_options
+      define_method "cdn:containers:add" do |name, *names|
+        cli_command(options) {
+          names = [name] + names
+          names.each { |name|
+            res = ContainerResource.new(Connection.instance.storage, name)
+            name = res.container
+            begin
+              if res.container_head()
+                response = Connection.instance.cdn.put_container(name)
+                @log.display "Added container '#{name}' to the CDN."
+              else
+                @log.error "The container '#{name}' does not exist in your storage account. Please create the storage container first and then add it to the CDN.", :incorrect_usage
+              end
+            rescue Fog::Storage::HP::NotFound
+              @log.error "The container '#{name}' does not exist in your storage account. Please create the storage container first and then add it to the CDN.", :incorrect_usage
+            end
+          }
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/cdn_containers/get.rb

@@ -0,0 +1,70 @@
+# 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 "cdn:containers:get <name> [attribute..]", "Get the value of an attribute of a CDN container."
+      long_desc <<-DESC
+  Get the value of an attribute for an existing CDN container. The allowed attributes whose value can be retrieved are:
+  * 'X-Ttl'
+  * 'X-Cdn-Uri'
+  * 'X-Cdn-Enabled'
+  * 'X-Log-Retention'. 
+  
+  Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud cdn:containers:get :my_cdn_container                            # List all the values
+  hpcloud cdn:containers:get :my_cdn_container "X-Ttl"                    # Get the value of the attribute 'X-Ttl'
+  hpcloud cdn:containers:get :my_cdn_container "X-Cdn-Uri"                # Get the value of the attribute 'X-Cdn-Uri'
+  hpcloud cdn:containers:get :my_cdn_container "X-Ttl" -z region-a.geo-1  # Get the value of the attribute `X-Ttl` for availability zone `regioni-a.geo`
+      DESC
+      CLI.add_common_options
+      define_method "cdn:containers:get" do |name, *attributes|
+        cli_command(options) {
+          res = ContainerResource.new(Connection.instance.cdn, name)
+          name = res.container
+          # check to see cdn container exists
+          begin
+            response = Connection.instance.cdn.head_container(name)
+            allowed_attributes = ['X-Ttl', 'X-Cdn-Uri', 'X-Cdn-Enabled', 'X-Log-Retention']
+            if attributes.empty?
+              attributes = allowed_attributes
+            end
+            attributes.each{ |attribute|
+              if allowed_attributes.include?(attribute) == false && response.headers["#{attribute}"].nil?
+                @log.error "The value of the attribute '#{attribute}' cannot be retrieved. The allowed attributes are '#{allowed_attributes.join(', ')}'.", :incorrect_usage
+              else
+                value = response.headers["#{attribute}"]
+                value = "\n" if value.nil?
+                @log.display "#{attribute} #{value}"
+              end
+            }
+          rescue Fog::CDN::HP::NotFound => error
+            @log.fatal "You don't have a container named '#{name}' on the CDN.", :not_found
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/cdn_containers/location.rb

@@ -0,0 +1,61 @@
+# 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 'cdn:containers:loc' => 'cdn:containers:location'
+
+      desc "cdn:containers:location <name>", "Get the location of a container on the CDN."
+      long_desc <<-DESC
+  Get the location of an existing container on the CDN. Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud cdn:containers:location :my_cdn_container                     # Get the location of the container 'my_cdn_container'
+  hpcloud cdn:containers:location :my_cdn_container -z region-a.geo-1   # Get the location of the container `my_cdn_container` for availability zone `region-a.geo-1`
+
+Aliases: cdn:containers:loc
+      DESC
+      method_option :ssl, :default => false,
+                    :type => :boolean, :aliases => '-s',
+                    :desc => 'Print the SSL version of the URL.'
+      CLI.add_common_options
+      define_method "cdn:containers:location" do |name, *names|
+        cli_command(options) {
+          names = [name] + names
+          names.each { |name|
+            resource = ResourceFactory.create(Connection.instance.storage, name)
+            if resource.container_head
+              if options.ssl
+                @log.display resource.cdn_public_ssl_url
+              else
+                @log.display resource.cdn_public_url
+              end
+            else
+              @log.error resource.cstatus
+            end
+          }
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+# 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(cdn:containers:rm cdn:containers:delete cdn:containers:del) => 'cdn:containers:remove'
+
+      desc "cdn:containers:remove name [name ...]", "Remove containers from the CDN."
+      long_desc <<-DESC
+  Remove containers from the CDN. Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud cdn:containers:remove :tainer1 :tainer2                    # Delete the containers `:tainer1` and `:tainer2` from the CDN
+  hpcloud cdn:containers:remove :my_cdn_container -z region-a.geo-1  # Delete the container `my_cdn_container for the availability zone `region-a.geo-1` from the CDN
+
+Aliases: cdn:containers:rm, cdn:containers:delete, cdn:containers:del
+      DESC
+      CLI.add_common_options
+      define_method "cdn:containers:remove" do |name, *names|
+        cli_command(options) {
+          names = [name] + names
+          names.each { |name|
+            begin
+              name = name[1..-1] if name.start_with?(":")
+              Connection.instance.cdn.delete_container(name)
+              @log.display "Removed container '#{name}' from the CDN."
+            rescue Excon::Errors::NotFound, Fog::CDN::HP::NotFound
+              @log.error "You don't have a container named '#{name}' on the CDN.", :not_found
+            end
+          }
+        }
+      end
+    end
+  end
+end