hpcloud 2.0.0

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

@@ -0,0 +1,78 @@
+# 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 "subnets:add <name> <network_id_or_name> <cidr>", "Add a subnet."
+      long_desc <<-DESC
+  Add a new subnet to your network with the specified name and CIDR.  Optionally, you can specify IP version, gateway, DHCP, DNS name servers, or host routes.  The add command will do its best to guess the IP version from the CIDR, but you may override it.  The DNS name servers should be a command seperated list e.g.: 10.1.1.1,10.2.2.2.  The host routes should be a semicolon separated list of destination and nexthop pairs e.g.: 127.0.0.1/32,10.1.1.1;100.1.1.1/32,10.2.2.2
+
+Examples:
+  hpcloud subnets:add subwoofer netty 127.0.0.0/24        # Create a new subnet named 'subwoofer'
+  hpcloud subnets:add subwoofer netty 127.0.0.0/24 -g 127.0.0.1 -d # Create a new subnet named 'subwoofer' with gateway and DHCP
+      DESC
+      method_option :ipversion,
+                    :type => :string, :aliases => '-i',
+                    :desc => 'IP version.'
+      method_option :gateway,
+                    :type => :string, :aliases => '-g',
+                    :desc => 'Gateway IP address.'
+      method_option :dhcp, :default => true,
+                    :type => :boolean, :aliases => '-d',
+                    :desc => 'Enable DHCP.'
+      method_option :dnsnameservers,
+                    :type => :string, :aliases => '-n',
+                    :desc => 'Comma separated list of DNS name servers.'
+      method_option :hostroutes,
+                    :type => :string, :aliases => '-h',
+                    :desc => 'Semicolon separated list of host routes pairs.'
+      CLI.add_common_options
+      define_method "subnets:add" do |name, network, cidr|
+        cli_command(options) {
+          if Subnets.new.get(name).is_valid? == true
+            @log.fatal "Subnet with the name '#{name}' already exists"
+          end
+          network = HP::Cloud::Networks.new.get(network)
+          if network.is_valid? == false
+            @log.fatal network.cstatus
+          end
+
+          subnet = HP::Cloud::SubnetHelper.new(Connection.instance)
+          subnet.name = name
+          subnet.network_id = network.id
+          subnet.set_cidr(cidr)
+          subnet.set_ip_version(options[:ipversion])
+          subnet.set_gateway(options[:gateway])
+          subnet.dhcp = options[:dhcp]
+          subnet.set_dns_nameservers(options[:dnsnameservers])
+          subnet.set_host_routes(options[:hostroutes])
+          if subnet.save == true
+            @log.display "Created subnet '#{name}' with id '#{subnet.id}'."
+          else
+            @log.fatal subnet.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/subnets/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(subnets:rm subnets:delete subnets:del) => 'subnets:remove'
+
+      desc "subnets:remove name_or_id [name_or_id ...]", "Remove a subnet (specified by name or ID)."
+      long_desc <<-DESC
+  Remove subnet by specifying their names or ID. You may specify more than one subnet name or ID on a command line.
+
+Examples:
+  hpcloud subnets:remove blue red  # Delete the subnet 'blue' and 'red'
+  hpcloud subnets:remove ffc0edba  # Delete the subnet with ID ffc0edba
+
+Aliases: subnets:rm, subnets:delete, subnets:del
+      DESC
+      CLI.add_common_options
+      define_method "subnets:remove" do |name_or_id, *name_or_ids|
+        cli_command(options) {
+          name_or_ids = [name_or_id] + name_or_ids
+          subnets = Subnets.new.get(name_or_ids, false)
+          subnets.each { |subnet|
+            sub_command("removing subnet") {
+              if subnet.is_valid?
+                subnet.destroy
+                @log.display "Removed subnet '#{subnet.name}'."
+              else
+                @log.error subnet.cstatus
+              end
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/subnets/update.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 "subnets:update <name>", "Update a subnet."
+      long_desc <<-DESC
+  Update a subnet IP version, gateway, DHCP, DNS name servers, or host routes.  The update command will do its best to guess the IP version from the CIDR, but you may override it.  The DNS name servers should be a command seperated list e.g.: 10.1.1.1,10.2.2.2.  The host routes should be a semicolon separated list of destination and nexthop pairs e.g.: 127.0.0.1/32,10.1.1.1;100.1.1.1/32,10.2.2.2
+
+Examples:
+  hpcloud subnets:update subwoofer -g 10.0.0.1     # Update 'subwoofer' gateway
+  hpcloud subnets:update subwoofer -n 100.1.1.1 -d # Update 'subwoofer' with new DNS and DHCP
+      DESC
+      method_option :ipversion,
+                    :type => :string, :aliases => '-i',
+                    :desc => 'IP version.'
+      method_option :gateway,
+                    :type => :string, :aliases => '-g',
+                    :desc => 'Gateway IP address.'
+      method_option :dhcp,
+                    :type => :boolean, :aliases => '-d',
+                    :desc => 'Enable DHCP.'
+      method_option :dnsnameservers,
+                    :type => :string, :aliases => '-n',
+                    :desc => 'Comma separated list of DNS name servers.'
+      method_option :hostroutes,
+                    :type => :string, :aliases => '-h',
+                    :desc => 'Semicolon separated list of host routes pairs.'
+      CLI.add_common_options
+      define_method "subnets:update" do |name|
+        cli_command(options) {
+          subnet = Subnets.new.get(name)
+          if subnet.is_valid? == false
+            @log.fatal subnet.cstatus
+          end
+          subnet.set_ip_version(options[:ipversion]) unless options[:ipversion].nil?
+          subnet.set_gateway(options[:gateway]) unless options[:gateway].nil?
+          subnet.dhcp = options[:dhcp] unless options[:dhcp].nil?
+          subnet.set_dns_nameservers(options[:dnsnameservers]) unless options[:dnsnameservers].nil?
+          subnet.set_host_routes(options[:hostroutes]) unless options[:hostroutes].nil?
+          if subnet.save == true
+            @log.display "Updated subnet '#{name}'."
+          else
+            @log.fatal subnet.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/subnets.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/subnets/add.rb'
+require 'hpcloud/commands/subnets/remove.rb'
+require 'hpcloud/commands/subnets/update.rb'
+require 'hpcloud/subnets'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map 'subnets:list' => 'subnets'
+    
+      desc 'subnets [name_or_id ...]', "List the available subnets."
+      long_desc <<-DESC
+  Lists all the subnets that are associated with the account. The list begins with identifier and contains name, status, shared, admin state, and subnets.  Optionally, you can filter the list by specifying name or ID.
+
+Examples:
+  hpcloud subnets       # List all subnets
+  hpcloud subnets b8e90a48     # List the details for subnets with id `b8e90a48`
+  hpcloud subnets testo # List the details for subnets named `testo`
+
+Aliases: subnets:list
+      DESC
+      CLI.add_report_options
+      CLI.add_common_options
+      def subnets(*arguments)
+        cli_command(options) {
+          subnets = Subnets.new
+          if subnets.empty?
+            @log.display "You currently have no subnets, use `#{selfname} subnets:add <name>` to create one."
+          else
+            ray = subnets.get_array(arguments)
+            if ray.empty?
+              @log.display "There are no subnets that match the provided arguments"
+            else
+              Tableizer.new(options, SubnetHelper.get_keys(), ray).print
+            end
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/tempurl.rb

@@ -0,0 +1,62 @@
+# 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 'tmpurl' => 'tempurl'
+    
+      desc 'tempurl <object> ...', 'Create temporary URLs for the given objects.'
+      long_desc <<-DESC
+  Create temporary URLS for the given objects. Creating a temporary URL allows you to share an object for a specified period of time making it available to everyone.  Only users with access to the URL can access the file.  You can specify the time period in seconds (s), hours (h), or days (d).  If you do not specify a time period, the default is two days.  Optionally, you can specify an availability zone.
+
+Examples: 
+  hpcloud tempurl -p7d :my_container/file.txt   # Create a temporary URL for the file `file.txt` with a period of 7 days
+  hpcloud tempurl -p24h :my_container/file.txt :my_container/other.txt #  Create temporary URLs for the files `file.txt` and `other.txt` in container `my_container` with a period of 24 hours
+  hpcloud tempurl :my_container/file.txt -z region-a.geo-1  # Create a temporary URL for the file `file.txt` with a period of 7 days for availability zone `region-a.geo-1`
+
+Aliases: tmpurl
+      DESC
+      method_option :time_period,
+                    :type => :string, :aliases => '-p',
+                    :desc => 'time period to keep the url alive'
+      method_option :update,
+                    :type => :boolean, :aliases => '-u',
+                    :desc => 'Update an existing tempurl'
+      CLI.add_common_options
+      def tempurl(name, *names)
+        cli_command(options) {
+          names = [name] + names
+          names.each { |name|
+            resource = ResourceFactory.create(Connection.instance.storage, name)
+            url = resource.tempurl(TimeParser.parse(options[:time_period]))
+            unless url.nil?
+              @log.display url
+            else
+              @log.error resource.cstatus
+            end
+          }
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+# 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 "volumes:add <name> [size]", "Add a volume."
+      long_desc <<-DESC
+  Add a new volume to your compute account with the specified name and size.  Optionally, you can specify a description, metadata or availability zone.  If you do not specify a size, it is taken from the specified snapshot or image.  If no image or snapshot is specified, the size defaults to 1 gigabyte.
+
+Examples:
+  hpcloud volumes:add my_volume 10 --zone az3    # Create a new volume named 'my_volume' of size 10 in zone az3
+  hpcloud volumes:add my_volume -s 'snappy'      # Create a new volume named 'my_volume' based on the snapshot 'snappy'
+  hpcloud volumes:add my_volume -i 53e78869      # Create a new bootable volume named 'my_volume' based on the image '53e78869'
+      DESC
+      method_option :description,
+                    :type => :string, :aliases => '-d',
+                    :desc => 'Description of the volume.'
+      method_option :metadata,
+                    :type => :string, :aliases => '-m',
+                    :desc => 'Set the metadata.'
+      method_option :snapshot,
+                    :type => :string, :aliases => '-s',
+                    :desc => 'Create a volume from the specified snapshot.'
+      method_option :image,
+                    :type => :string, :aliases => '-i',
+                    :desc => 'Create a volume from the specified image.'
+      method_option :zone,
+                    :type => :string,
+                    :desc => 'Create a volume in the specified zone.'
+      CLI.add_common_options
+      define_method "volumes:add" do |name, *volume_size|
+        cli_command(options) {
+          if Volumes.new.get(name).is_valid? == true
+            @log.fatal "Volume with the name '#{name}' already exists"
+          end
+          vol = HP::Cloud::VolumeHelper.new(Connection.instance)
+          vol.name = name
+          vol.size = volume_size.first
+          unless options[:snapshot].nil?
+            snapshot = HP::Cloud::Snapshots.new.get(options[:snapshot])
+            if snapshot.is_valid?
+              vol.snapshot_id = snapshot.id.to_s
+              vol.size = snapshot.size.to_s if vol.size.nil?
+            else
+              @log.fatal snapshot.cstatus
+            end
+          end
+          unless options[:image].nil?
+            image = HP::Cloud::Images.new.get(options[:image])
+            if image.is_valid?
+              vol.imageref = image.id.to_s
+            else
+              @log.fatal image.cstatus
+            end
+          end
+          vol.size = 1 if vol.size.nil?
+          vol.description = options[:description]
+          vol.availability_zone = options[:zone]
+          if vol.save == true
+            @log.display "Created volume '#{name}' with id '#{vol.id}'."
+          else
+            @log.fatal vol.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/volumes/attach.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 "volumes:attach <volume> <server> <device_or_number>", "Attach a volume to a server specified by device name or number."
+      long_desc <<-DESC
+  Attach a volume to a server on the specified device name.  You may specify a device name in the format /dev/vdX where X is c, d, e, ... or a attacment point 3, 4, 5,...  The attacment point 1 would map to /dev/vda on a Linux platform, but /dev/vda and /dev/vdb are already in use by the server, so you need to start with 3 or /dev/vdc.  If you attempt to attach a volume to an attachment point that is in use, it will fail silently.  The call is asynchronous and the failure cannot be detected by the CLI.  If you attempt to mount to attachment point 4 and attachment point 3 is not in use, your volume will be attached to attachment point 3 or /dev/vdc on Linux.  This cannot be detected by the CLI.
+
+Examples:
+  hpcloud volumes:attach myVolume myServer /dev/vdc                         # Attach volume `myVolume` to server `myServer` on device `/dev/vdc`
+  hpcloud volumes:attach f9520651 b8e90a48 4                                # Attach volume `f9520651` to server `b8e90a48` on device `/dev/vdb`
+
+      DESC
+      CLI.add_common_options
+      define_method "volumes:attach" do |vol_name, server_name, device|
+        cli_command(options) {
+          server = Servers.new.get(server_name)
+          if server.is_valid?
+            volume = Volumes.new.get(vol_name)
+            if volume.is_valid?
+              if volume.fog.ready?
+                device = volume.map_device(device)
+                volume.attach(server, device)
+                @log.display "Attached volume '#{volume.name}' to '#{server.name}' on '#{device}'."
+              else
+                @log.fatal "Error attaching volume already in use '#{volume.name}'", :conflicted
+              end
+            else
+              @log.fatal volume.cstatus
+            end
+          else
+            @log.fatal server.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/volumes/detach.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.
+
+require 'csv'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc "volumes:detach name_or_id [name_or_id ...]", "Detach a volume or volumes."
+      long_desc <<-DESC
+  Detach volumes from all servers.  You may specify the volume by name or ID.  You can detach one more more volumes in a command line.
+
+Examples:
+  hpcloud volumes:detach myVolume  # Detach the volume 'myVolume'
+  hpcloud volumes:detach 3407653b  # Detach the volume with ID 1159
+
+      DESC
+      CLI.add_common_options
+      define_method "volumes:detach" do |name_or_id, *name_or_ids|
+        cli_command(options) {
+          name_or_ids = [name_or_id] + name_or_ids
+          Volumes.new.get(name_or_ids).each { |volume|
+            if volume.is_valid?
+              if (volume.detach() == true)
+                @log.display "Detached volume '#{volume.name}' from '#{volume.servers}'."
+              else
+                @log.fatal volume.cstatus
+              end
+            else
+              @log.fatal volume.cstatus
+            end
+          }
+        }
+      end
+
+    end
+  end
+end

data/lib/hpcloud/commands/volumes/metadata/add.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 'volumes:metadata:update' => 'volumes:metadata:add'
+
+      desc "volumes:metadata:add <name_or_id> <metadata>", "Add metadata to a volume."
+      long_desc <<-DESC
+  Add metadata to a volume in your compute account.  You can specify the volume name or ID.  Optionally, you can specify an availability zone. The metadata must be a comma separated list of name value pairs.
+
+Examples:
+  hpcloud volumes:metadata:add my_volume 'r2=d2,c3=po'  # Add the specified metadata to the volume (f the metadata exists, it is updated)
+
+Aliases: volumes:metadata:update
+      DESC
+      CLI.add_common_options
+      define_method "volumes:metadata:add" do |name_or_id, metadata|
+        cli_command(options) {
+          volume = Volumes.new.get(name_or_id.to_s)
+          if volume.is_valid? == false
+            @log.fatal volume.cstatus
+          else
+            if volume.meta.set_metadata(metadata)
+              @log.display "Volume '#{name_or_id}' set metadata '#{metadata}'."
+            else
+              @log.fatal volume.meta.cstatus
+            end
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/volumes/metadata.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.
+
+require 'hpcloud/metadata'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map 'volumes:metadata:list' => 'volumes:metadata'
+
+      desc "volumes:metadata <volume_name_or_id>", "List the metadata for a volume."
+      long_desc <<-DESC
+  List the metadata for a volume in your compute account. You may specify the volume by either the name or the ID.  Optionally, you can specify an availability zone.
+
+Examples:
+  hpcloud volumes:metadata Skynet   # List the metadata for volume 'Skynet'
+  hpcloud volumes:metadata d6a89a5d     # List metadata for the volume with the ID d6a89a5d
+
+Aliases: volumes:metadata:list
+      DESC
+      CLI.add_report_options
+      CLI.add_common_options
+      define_method "volumes:metadata" do |name_or_id|
+        cli_command(options) {
+          volume = Volumes.new.get(name_or_id)
+          if volume.is_valid?
+            hsh = volume.meta.to_array()
+            Tableizer.new(options, Metadata.get_keys(), hsh).print
+          else
+            @log.fatal volume.cstatus
+          end
+        }
+      end
+    end
+  end
+end