hpcloud 2.0.6 → 2.0.8

data/lib/hpcloud/accounts.rb

@@ -42,6 +42,14 @@ module HP
                :db,
                :network,
                :"block storage"]
+      # we only list whats available in connection.rb
+      CATALOG = [:catalog_compute,
+                 :catalog_object_storage,
+                 :catalog_block_storage,
+                 :catalog_cdn,
+                 :catalog_dns,
+                 :catalog_load_balancer,
+                 :catalog_networking]
       OPTIONS = [:connect_timeout,
                  :read_timeout,
                  :write_timeout,
@@ -68,6 +76,7 @@ module HP
         ret = ""
         CREDENTIALS.each{|key| ret += "\n * " + key.to_s }
         ZONES.each{|key| ret += "\n * " + key.to_s }
+        CATALOG.each{|key| ret += "\n * " + key.to_s }
         OPTIONS.each{|key| ret += "\n * " + key.to_s }
         return ret
       end
@@ -131,6 +140,7 @@ module HP
               hsh[:regions] = regions
             end
             hsh[:regions] = {} if hsh[:regions].nil?
+            hsh[:catalog] = {} if hsh[:catalog].nil?
             hsh[:options] = {} if hsh[:options].nil?
             @accts[account] = hsh
           rescue Exception => e
@@ -150,6 +160,7 @@ module HP
           uri = Config.new.get(:default_auth_uri)
           @accts[account] = {:credentials=>{:auth_uri=>uri},
                              :regions=>{},
+                             :catalog=>{},
                              :options=>{}}
         end
         return @accts[account]
@@ -157,7 +168,7 @@ module HP
 
       def set_cred(account, cred)
         if @accts[account].nil?
-          @accts[account] = {:credentials=>{}, :regions=>{}, :options=>{}}
+          @accts[account] = {:credentials=>{}, :regions=>{}, :catalog=>{}, :options=>{}}
         end
         @accts[account][:credentials] = cred
         unless cred[:hp_auth_uri].nil?
@@ -169,7 +180,7 @@ module HP
 
       def set_regions(account, regions)
         if @accts[account].nil?
-          @accts[account] = {:credentials=>{}, :regions=>{}, :options=>{}}
+          @accts[account] = {:credentials=>{}, :regions=>{}, :catalog=>{}, :options=>{}}
         end
         @accts[account][:regions] = regions
       end
@@ -182,6 +193,9 @@ module HP
           hsh[:credentials][key] = value
         elsif ZONES.include?(key)
           hsh[:regions][key] = value
+        elsif CATALOG.include?(key)
+          cat_key = key.to_s.gsub(/^catalog_/,'').to_sym
+          hsh[:catalog][cat_key] = value
         elsif OPTIONS.include?(key)
           hsh[:options][key] = value
         elsif TOP_LEVEL.include?(key)
@@ -235,12 +249,24 @@ module HP
         end
       end
 
+      def get_acct_catalog_map(account_name)
+        hsh = get(account_name)
+        provider = hsh[:provider] || 'hp'
+        provider = provider.downcase
+        catalog = hsh[:catalog] || {}
+        options = {}
+        options[:catalog] = catalog
+        options[:provider] = provider
+        return options
+      end
+
       def create_options(account_name, zone, avl_zone = nil)
         hsh = get(account_name)
         provider = hsh[:provider] || 'hp'
         provider = provider.downcase
         creds = hsh[:credentials]
         regions = hsh[:regions] || {}
+        catalog = hsh[:catalog] || {}
         opts = hsh[:options]
         opts.delete(:preferred_flavor)
         opts.delete(:preferred_image)
@@ -261,6 +287,7 @@ module HP
           options[:hp_avl_zone] = avl_zone
           options[:connection_options] = opts
           options[:user_agent] = "HPCloud-UnixCLI/#{HP::Cloud::VERSION}"
+          options[:hp_service_type] = zone if zone != nil
         else
           options = creds
         end

data/lib/hpcloud/commands/account/catalog.rb

@@ -29,10 +29,16 @@ module HP
       desc 'account:catalog <account_to_catalog> [service]', "Print the service catalog of the specified account."
       long_desc <<-DESC
   Print the service catalog of the specified account.  Optionally, you may specify a particular service to print such as `Compute`.
-  
+
+  You can then configure the catalog for your account with hpcloud account:edit catalog_<service>=<name> so that
+   the cli knows how to talk with your particular cloud implementation. For example:
+   hpcloud account:edit useast catalog_compute=nova
+   See hpcloud help account:edit for more details.
+
 Examples:
   hpcloud account:catalog useast # Print the service catalog of `useast`:
   hpcloud account:catalog useast Compute # Print the compute catalog of `useast`:
+
       DESC
       method_option :debug, :type => :string, :alias => '-x',
                     :desc => 'Debug logging 1,2,3,...'

data/lib/hpcloud/commands/account/edit.rb

@@ -53,6 +53,7 @@ Examples:
   hpcloud account:edit  # Edit the default account settings interactively
   hpcloud account:edit pro auth_uri='https://127.0.0.1/' block_availability_zone='az-2.region-a.geo-1' # Set the account credential authorization URI to `https://127.0.0.1\` and the block availability zone to `az-2.region-a.geo-1`
   hpcloud account:setup rackspace -p rackspace # Create a Rackspace account for migration
+  hpcloud account:edit pro catalog_compute=nova catalog_networking=neutron catalog_block_storage=cinder # will configure your cli to understand that the catalog name for compute on your cloud is called nova
 
 Aliases: account:add, account:setup, account:update
       DESC

data/lib/hpcloud/connection.rb

@@ -89,7 +89,7 @@ module HP
           @authcache.write(opts, creds)
         end
         if opts[:hp_avl_zone].nil?
-          opts[:hp_avl_zone] = @authcache.default_zone(opts, service)
+          opts[:hp_avl_zone] = @authcache.default_zone(opts, service_type_name(account, service))
         end
         opts[:credentials] = creds
       end
@@ -217,11 +217,16 @@ module HP
       end
 
       def create_options(account_name, zone)
-        opts = Accounts.new.create_options(account_name, zone, @options[:availability_zone])
+        real_zone_name = (zone != nil) ? service_type_name(account_name, zone): zone
+        opts = Accounts.new.create_options(account_name, real_zone_name, @options[:availability_zone])
         opts[:hp_tenant_id] = @options[:tenantid] unless @options[:tenantid].nil?
         return opts
       end
 
+      def get_acct_catalog_map(account_name)
+        return Accounts.new.get_acct_catalog_map(account_name)
+      end
+
       def zones(service)
         name = get_account(nil)
         cata = catalog(name, service)
@@ -256,6 +261,27 @@ module HP
         end
       end
 
+      # lets identify the real service type name
+      # create support for account config to have a section called :service_catalog
+      # This section will identify mappings for keys like : object_storage, compute,  block_storage, cdn
+      #      networking, dns, and load_balancer
+      # The values can be the real names of the offerings.   This enables private cloud implementations to
+      # have service catalog names that make more sense for there implementation.
+      def service_type_name(account_name, name)
+        map_opts = get_acct_catalog_map(account_name)
+        case map_opts[:provider]
+          when "hp"
+            service_name = name
+            unless map_opts[:catalog].nil?
+              service_catalog_key = name.to_s.downcase.gsub(' ','_').to_sym
+              service_name = map_opts[:catalog][service_catalog_key] if map_opts[:catalog].has_key?(service_catalog_key)
+            end
+            return service_name
+          else
+            return name
+        end
+      end
+
       def tenants(account_name = nil)
         account = get_account(account_name)
         opts = create_options(account, nil)

data/lib/hpcloud/version.rb

@@ -21,7 +21,7 @@
 
 module HP
   module Cloud
-    VERSION = '2.0.6'
-    SHA1 = '839edf03a372bf62a59caebcee1908e5018a5d4b'
+    VERSION = '2.0.8'
+    SHA1 = '7ccf63b42f0eed051d345f36c123b2c8902e0f9e'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hpcloud
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor