lorj_cloud 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c78228ebae857de831a11eff87d55bb65d376c4a
-  data.tar.gz: ee39d199148951c639823b494cc7c7b558d32668
+  metadata.gz: b519cccf1d258aa732b00a8f2cddd12be2880a4e
+  data.tar.gz: 8bdf938b94e3d18c99b254d4d7bbf35a192828d9
 SHA512:
-  metadata.gz: 1ec6f569ee8c095e2c372b472dd89b80094ad82ce8e9701332159aabd7229ee5ec1f2d837d3b882d7b9f0e8c6760e3e3d238d05057c546c24923cc95a05307de
-  data.tar.gz: 4ea13e6447d00816bfd945e02006e7fe53a75264369416c14b0e32532e9db6682fcb7dbb493c3cb67bf58f50eaab2c18afc0e771cbe1c449bbbc5205af1024e8
+  metadata.gz: 4e65120fb8287d9ba0399e3b79837ab95e0fd19da9b0f3fa97d3028829083a6928cb5040202c4c518a1c112568533b978b77f1301b9207a9e18abc4bfc5f0b3b
+  data.tar.gz: 596c0c88b342bad2eb3c2ff99c0783f88a4dfab32d9619dc7bbd5252d436ab5522707bfb5b94062ec0d58467b02c8e3c332e2e0ef00e5448b221f140df225227

data/lib/lorj_cloud/version.rb

@@ -1,5 +1,5 @@
 # LorjCloud module
 module LorjCloud
-  VERSION = '0.1.8'
-  DATE = '2015-06-30'
+  VERSION = '0.1.9'
+  DATE = '2015-07-02'
 end

data/lib/process/cloud/data.yaml

@@ -50,11 +50,13 @@
       :desc:              "Service identification for compute"
       :account_exclusive: true
       :account:           true
+      :export:            true
       :step:              :provider_config
     :network:
       :desc:              "Service identification for network"
       :account_exclusive: true
       :account:           true
+      :export:            true
       :step:              :provider_config
 
   # Defines ssh keys credentials
@@ -68,23 +70,27 @@
     :keypair_name:
       :desc:               "keypair name defined in your cloud to access your server."
       :ask_step:           :provider_config
+      :export:             true
     :auth_uri:
       :desc:               "Generic service auth url"
       :ask_step:           :provider_config
       :account_exclusive:  true
       :account:            true
       :required:           true
+      :export:             true
     :user_domain:
       :ask_step:           :provider_config
       :account_exclusive:  true
       :account:            true
       :required:           false
+      :export:             true
     :account_id:
       :desc:               "Generic Cloud Account name."
       :ask_step:           :provider_config
       :account_exclusive:  true
       :account:            true
       :required:           true
+      :export:             true
     :account_key:
       :desc:               "Generic cloud account key"
       :ask_step:           :provider_config
@@ -92,25 +98,30 @@
       :account:            true
       :required:           true
       :encrypted:          true
+      :export:             true
     :tenant:
       :desc:               "Tenant Name (Project name)"
       :ask_step:           :provider_config
       :account_exclusive:  true
       :account:            true
       :required:           true
+      :export:             true
     :prj_domain:
       :ask_step:           :provider_config
       :account_exclusive:  true
       :account:            true
       :required:           false
+      :export:             true
 
   :server:
     :network_name:
       :ask_step:        :cloud_config
       :desc:            "Network name to attach to each forge boxes. By default we use 'forj'. If it doesn't exist, it will be created."
+      :export:             true
     :security_group:
       :desc:            "Security group name to configure and attach to each forge boxes."
       :ask_step:        :cloud_config
+      :export:             true
     :box_name:
       :desc:            "Box name"
     :flavor_name:
@@ -122,6 +133,7 @@
          :object:       :flavor
          :value:        :name
          :validate:     :list_strict
+      :export:             true
     :image_name:
       :desc:            "Image name"
       :ask_step:        :cloud_config
@@ -131,6 +143,7 @@
          :object:       :image
          :value:        :name
          :validate:     :list_strict
+      :export:             true
     :ports:
       :desc:            "List of security group rules (1 port or range of ports) to open to the external network."
       :ask_step:        :cloud_config

data/lib/process/cloud/process/server.rb

@@ -76,7 +76,8 @@ class Lorj::BaseDefinition
              :query_e => :forj_query_server,
              :get_e => :forj_get_server,
              #         :update_e   => :forj_update_server,
-             :delete_e => :forj_delete_server
+             :delete_e => :forj_delete_server,
+             :refresh_e => :controller_refresh
             )
 
   obj_needs :CloudObject,  :compute_connection

data/lib/process/cloud/providers/hpcloud/hpcloud.rb

@@ -24,6 +24,7 @@ hpcloud_path = File.expand_path(File.dirname(__FILE__))
 load File.join(hpcloud_path, 'hpcloud_declare.rb')
 load File.join(hpcloud_path, 'hpcloud_generic.rb')
 load File.join(hpcloud_path, 'hpcloud_query.rb')
+load File.join(hpcloud_path, 'hpcloud_refresh.rb')
 
 load File.join(hpcloud_path, 'compute.rb')
 load File.join(hpcloud_path, 'network.rb')
@@ -33,6 +34,60 @@ load File.join(hpcloud_path, 'security_groups.rb')
 # Except Cloud connection, all HPCloud objects management are described/called
 # in HP* modules.
 class HpcloudController # rubocop: disable Metrics/ClassLength
+  # Ready to convert the controller in more maintainable code
+  # Only refresh is currently used.
+  def self.def_cruds(*crud_types)
+    crud_types.each do |crud_type|
+      case crud_type
+      when :create, :delete, :refresh
+        base_method(crud_type)
+      when :query, :get
+        query_method(crud_type)
+      when :update
+        update_method(crud_type)
+      end
+    end
+  end
+  def self.update_method(crud_type)
+    define_method(crud_type) do |sObjectType, obj, hParams|
+      method_name = "#{crud_type}_#{sObjectType}"
+      if self.class.method_defined? method_name
+        send(method_name, obj, hParams)
+      else
+        controller_error "'%s' is not a valid object for '%s'",
+                         sObjectType, crud_type
+      end
+    end
+  end
+
+  def self.query_method(crud_type)
+    define_method(crud_type) do |sObjectType, sCondition, hParams|
+      method_name = "#{crud_type}_#{sObjectType}"
+      if self.class.method_defined? method_name
+        send(method_name, hParams, sCondition)
+      else
+        controller_error "'%s' is not a valid object for '%s'",
+                         sObjectType, crud_type
+      end
+    end
+  end
+
+  def self.base_method(crud_type)
+    define_method(crud_type) do |sObjectType, p1|
+      method_name = "#{crud_type}_#{sObjectType}"
+      if self.class.method_defined? method_name
+        send(method_name, p1)
+      else
+        controller_error "'%s' is not a valid object for '%s'",
+                         sObjectType, crud_type
+      end
+    end
+  end
+
+  # Define the hpcloud controller handlers
+  # def_cruds :create, :delete, :get, :query, :update, :refresh
+  def_cruds :refresh
+
   def connect(sObjectType, hParams)
     case sObjectType
     when :services

data/lib/process/cloud/providers/hpcloud/hpcloud_refresh.rb

@@ -0,0 +1,38 @@
+# encoding: UTF-8
+
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Defined Openstack object refresh.
+class HpcloudController
+  def self.def_refresh(name)
+    define_method("refresh_#{name}") do |_object_type, object|
+      if object.class.method_defined?(:reload)
+        begin
+          object.reload
+        rescue => e
+          PrcLib.error("'%s': %s", object.class, e)
+          ret = false
+        else
+          ret = true
+        end
+      end
+      # Uses :[] or :<key> to match object and query attr.
+      Lorj.debug(4, "'%s' refreshed '%s'", __method__, object.class)
+      ret
+    end
+  end
+
+  def_refresh :server
+end

data/lib/process/cloud/providers/openstack/openstack.rb

@@ -26,6 +26,7 @@ load File.join(hpcloud_path, 'openstack_get.rb')
 load File.join(hpcloud_path, 'openstack_delete.rb')
 load File.join(hpcloud_path, 'openstack_create.rb')
 load File.join(hpcloud_path, 'openstack_update.rb')
+load File.join(hpcloud_path, 'openstack_refresh.rb')
 
 # Defines Meta Openstack object
 class Openstack
@@ -260,7 +261,7 @@ class OpenstackController
   def self.def_cruds(*crud_types)
     crud_types.each do |crud_type|
       case crud_type
-      when :create, :delete
+      when :create, :delete, :refresh
         base_method(crud_type)
       when :query, :get
         query_method(crud_type)
@@ -295,10 +296,10 @@ class OpenstackController
   end
 
   def self.base_method(crud_type)
-    define_method(crud_type) do |sObjectType, hParams|
+    define_method(crud_type) do |sObjectType, p1|
       method_name = "#{crud_type}_#{sObjectType}"
       if self.class.method_defined? method_name
-        send(method_name, hParams)
+        send(method_name, p1)
       else
         controller_error "'%s' is not a valid object for '%s'",
                          sObjectType, crud_type
@@ -307,7 +308,7 @@ class OpenstackController
   end
 
   # Define the Openstack controller handlers
-  def_cruds :create, :delete, :get, :query, :update
+  def_cruds :create, :delete, :get, :query, :update, :refresh
 
   def connect(sObjectType, hParams)
     case sObjectType

data/lib/process/cloud/providers/openstack/openstack_refresh.rb

@@ -0,0 +1,39 @@
+# encoding: UTF-8
+
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Defined Openstack object refresh.
+class OpenstackController
+  def self.def_refresh(name)
+    define_method("refresh_#{name}") do |object|
+      ret = false
+      if object.class.method_defined?(:reload)
+        begin
+          object.reload
+        rescue => e
+          PrcLib.error("'%s': %s", object.class, e)
+        else
+          Lorj.debug(4, "'%s' refreshed '%s'", __method__, object.class)
+          ret = true
+        end
+      end
+      ret
+    end
+  end
+
+  dcl = %w(server)
+
+  dcl.each { |t| def_refresh t.to_sym }
+end

data/lorj_cloud.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1.0"
 
-  spec.add_runtime_dependency "lorj", ">= 1.0.17"
+  spec.add_runtime_dependency "lorj", ">= 1.0.19"
   spec.add_runtime_dependency 'subhash', '>= 0.1.3'
   spec.add_runtime_dependency "fog", "~> 1.30.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorj_cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Christophe Larsonneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.17
+        version: 1.0.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.17
+        version: 1.0.19
 - !ruby/object:Gem::Dependency
   name: subhash
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,7 @@ files:
 - lib/process/cloud/providers/hpcloud/hpcloud_declare.rb
 - lib/process/cloud/providers/hpcloud/hpcloud_generic.rb
 - lib/process/cloud/providers/hpcloud/hpcloud_query.rb
+- lib/process/cloud/providers/hpcloud/hpcloud_refresh.rb
 - lib/process/cloud/providers/hpcloud/network.rb
 - lib/process/cloud/providers/hpcloud/security_groups.rb
 - lib/process/cloud/providers/mock/mock.rb
@@ -202,6 +203,7 @@ files:
 - lib/process/cloud/providers/openstack/openstack_get.rb
 - lib/process/cloud/providers/openstack/openstack_process.rb
 - lib/process/cloud/providers/openstack/openstack_query.rb
+- lib/process/cloud/providers/openstack/openstack_refresh.rb
 - lib/process/cloud/providers/openstack/openstack_update.rb
 - lib/process/cloud/providers/templates/compute.rb
 - lib/process/cloud/providers/templates/mycloud.rb