lorj_cloud 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac7410d472dd8330f134ae65232458feeaf04af8
-  data.tar.gz: ac6f05d18594c89ff3fd97c9d4910389d0fe270f
+  metadata.gz: 26634b9c67df55b783869dd3e27efdcbcca992a3
+  data.tar.gz: 3b3430d3068e58f20d2434311d678bf7fe3c7579
 SHA512:
-  metadata.gz: 0b16cc0c2abd0d281a1bfbc6268f8ae476d50b48ea9095c322db292df49510d8770c1bab686b6d1458783963d0a91c47dc4eb059f440a0f2838c6478103e404e
-  data.tar.gz: 30d32069ae343d49bae3f133f4e312ff91bcddfde9ebc136e346dc0654db465b1ea9ab7d35f69c8ce92278822b11a9f7b993ca427c8fb489e808d466d77d0510
+  metadata.gz: 1dd52b5dba670954f34652a9da36fabe231f5e78ca585101e93b5dd5bb81b3c73659a400224ef75f2621171ca40abc181a1e1eab28263648ff518b91752ab10c
+  data.tar.gz: fc243f07fbc42a4d24b6e3faca2c4ac8814a6a5e061618696c08f7de0c3dcecd694e6e0fdb6374e08711eb0c6407d9a749b7c89f9557841581633d4e39dfac96

data/lib/lorj_cloud/version.rb

@@ -1,5 +1,5 @@
 # LorjCloud module
 module LorjCloud
-  VERSION = '0.1.11'
-  DATE = '2015-07-29'
+  VERSION = '0.1.12'
+  DATE = '2015-09-28'
 end

data/lib/process/cloud/process/connection.rb

@@ -28,12 +28,12 @@ class CloudProcess
                  hParams['credentials#tenant'])
     begin
       controller_connect(sCloudObj)
-   rescue => e
-     retry unless ssl_error_obj.error_detected(e.message, e.backtrace, e)
+    rescue => e
+      retry unless ssl_error_obj.error_detected(e.message, e.backtrace, e)
 
-     PrcLib.error('%s:%s: Unable to connect.\n%s',
-                  self.class, sCloudObj, e.message)
-     nil
+      PrcLib.error('%s:%s: Unable to connect.\n%s',
+                   self.class, sCloudObj, e.message)
+      nil
     end
   end
 end

data/lib/process/cloud/process/flavor.rb

@@ -74,7 +74,7 @@ class Lorj::BaseDefinition # rubocop: disable ClassAndModuleChildren
             )
 
   obj_needs :CloudObject, :compute_connection
-  obj_needs :data,        'server#flavor_name',         :for => [:create_e]
+  obj_needs :data,        'server#flavor_name', :for => [:create_e]
   # Cloud provider will need to map to one of those predefined flavors.
   # limitation values may match exactly or at least ensure those limitation
   # are under provider limitation
@@ -82,16 +82,16 @@ class Lorj::BaseDefinition # rubocop: disable ClassAndModuleChildren
   # Cloud provider defines.
   # CloudProcess EHD = 160, then Provider EHD = 200 is ok
   # but Provider EHD = 150 is not ok.
-  predefine_data_value('tiny',    :desc => 'VCU: 1,  RAM:512M, HD:1G,   '\
+  predefine_data_value('tiny', :desc => 'VCU: 1,  RAM:512M, HD:1G,   '\
                                            'EHD: 0G,   Swap: 0G')
-  predefine_data_value('xsmall',  :desc => 'VCU: 1,  RAM:1G,   HD:10G,  '\
+  predefine_data_value('xsmall', :desc => 'VCU: 1,  RAM:1G,   HD:10G,  '\
                                            'EHD: 10G,  Swap: 0G')
-  predefine_data_value('small',   :desc => 'VCU: 2,  RAM:2G,   HD:30G,  '\
+  predefine_data_value('small', :desc => 'VCU: 2,  RAM:2G,   HD:30G,  '\
                                            'EHD: 10G,  Swap: 0G')
-  predefine_data_value('medium',  :desc => 'VCU: 2,  RAM:4G,   HD:30G,  '\
+  predefine_data_value('medium', :desc => 'VCU: 2,  RAM:4G,   HD:30G,  '\
                                            'EHD: 50G,  Swap: 0G')
-  predefine_data_value('large',   :desc => 'VCU: 4,  RAM:8G,   HD:30G,  '\
+  predefine_data_value('large', :desc => 'VCU: 4,  RAM:8G,   HD:30G,  '\
                                            'EHD: 100G, Swap: 0G')
-  predefine_data_value('xlarge',  :desc => 'VCU: 8,  RAM:16G,  HD:30G,  '\
+  predefine_data_value('xlarge', :desc => 'VCU: 8,  RAM:16G,  HD:30G,  '\
                                            'EHD: 200G, Swap: 0G')
 end

data/lib/process/cloud/process/images.rb

@@ -95,5 +95,5 @@ class Lorj::BaseDefinition # rubocop: disable Style/ClassAndModuleChildren
             )
 
   obj_needs :CloudObject,  :compute_connection
-  obj_needs :data,         'server#image_name',          :for => [:create_e]
+  obj_needs :data,         'server#image_name', :for => [:create_e]
 end

data/lib/process/cloud/process/internet_network.rb

@@ -26,8 +26,8 @@
 # is capable to connect to internet
 # And to create this connection if possible.
 class Lorj::BaseDefinition # rubocop: disable ClassAndModuleChildren
-  define_obj(:internet_network,    :nohandler => true)
+  define_obj(:internet_network, :nohandler => true)
 
-  obj_needs :CloudObject,  :external_network # External network to connect if
+  obj_needs :CloudObject, :external_network # External network to connect if
   # needed.
 end

data/lib/process/cloud/process/internet_server.rb

@@ -21,7 +21,7 @@
 # Internet SERVER Object
 # internet server is a server connected to the internet network.
 class Lorj::BaseDefinition
-  define_obj(:internet_server,    :nohandler => true)
+  define_obj(:internet_server, :nohandler => true)
 
   obj_needs :CloudObject,  :internet_network
   obj_needs :CloudObject,  :server

data/lib/process/cloud/process/keypairs.rb

@@ -119,7 +119,7 @@ class Lorj::BaseDefinition
   obj_needs :data,         :keypair_path
   obj_needs :data,         :keypair_base
   # By default optional. But required by the import case if needed.
-  obj_needs :data,         :public_key,          :for => [:create_e]
+  obj_needs :data,         :public_key, :for => [:create_e]
 
   def_attribute :public_key
 end
@@ -333,9 +333,9 @@ class CloudProcess
       begin
         loc_pubkey = File.read(File.join(loc_kpair[:keypair_path],
                                          loc_kpair[:public_key_name]))
-     rescue => e
-       PrcLib.error("Unable to read '%s'.\n%s",
-                    loc_kpair[:public_key_file], e.message)
+      rescue => e
+        PrcLib.error("Unable to read '%s'.\n%s",
+                     loc_kpair[:public_key_file], e.message)
       else
         if loc_pubkey.split(' ')[1].strip == pub_keypair.split(' ')[1].strip
           is_coherent = true

data/lib/process/cloud/process/network.rb

@@ -46,8 +46,8 @@ class CloudProcess
   # Process Delete handler
   def forj_delete_network(sCloudObj, hParams)
     oProvider.delete(sCloudObj, hParams)
- rescue => e
-   PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
+  rescue => e
+    PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
   end
 
   def forj_get_network(sCloudObj, sID, hParams)
@@ -67,10 +67,10 @@ class Lorj::BaseDefinition
              :delete_e => :forj_delete_network
             )
   obj_needs :CloudObject,  :network_connection
-  obj_needs :data,         :network_name,        :for => [:create_e]
+  obj_needs :data,         :network_name, :for => [:create_e]
 
   obj_needs_optional
-  obj_needs :data,         :subnetwork_name,     :for => [:create_e]
+  obj_needs :data, :subnetwork_name, :for => [:create_e]
 
   # Any attribute are queriable
   def_attribute :external # true if network is external or not.
@@ -87,8 +87,8 @@ class CloudProcess
       PrcLib.state("Creating network '%s'", name)
       network = controller_create(sCloudObj)
       PrcLib.info("Network '%s' created", network[:name])
-   rescue => e
-     PrcLib.fatal(1, "Unable to create network '%s'", name, e)
+    rescue => e
+      PrcLib.fatal(1, "Unable to create network '%s'", name, e)
     end
     network
   end
@@ -101,7 +101,7 @@ class CloudProcess
     query = { :name => hParams[:network_name] }
 
     query_single(sCloudObj, query, hParams[:network_name])
- rescue => e
-   PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
+  rescue => e
+    PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
   end
 end

data/lib/process/cloud/process/public_ip.rb

@@ -98,8 +98,8 @@ class CloudProcess
       end
       PrcLib.info("Public IP '%s' for server '%s' "\
                   'assigned.', ip_address[:public_ip], name)
-   rescue => e
-     PrcLib.fatal(1, "Unable to assign a public IP to server '%s'", name, e)
+    rescue => e
+      PrcLib.fatal(1, "Unable to assign a public IP to server '%s'", name, e)
     end
     ip_address
   end

data/lib/process/cloud/process/router.rb

@@ -65,7 +65,7 @@ class Lorj::BaseDefinition
   obj_needs :CloudObject,  :network,             :for => [:create_e]
   obj_needs :CloudObject,  :subnetwork,          :for => [:create_e]
   obj_needs_optional
-  obj_needs :data,         :router_name,         :for => [:create_e]
+  obj_needs :data, :router_name, :for => [:create_e]
 
   def_attribute :gateway_network_id
 end
@@ -73,9 +73,9 @@ end
 # Port Object
 # Identify port attached to network
 class Lorj::BaseDefinition
-  define_obj :port,   :nohandler => true
+  define_obj :port, :nohandler => true
 
-  obj_needs :CloudObject,  :network_connection
+  obj_needs :CloudObject, :network_connection
   def_attribute :device_id
 
   def_attribute :network_id
@@ -88,7 +88,7 @@ end
 # To keep the network model more generic.
 class Lorj::BaseDefinition
   # No process handler defined. Just Controller object
-  define_obj :router_interface,   :nohandler => true
+  define_obj :router_interface, :nohandler => true
 
   obj_needs :CloudObject,  :network_connection
   obj_needs :CloudObject,  :router,              :for => [:create_e]
@@ -132,9 +132,9 @@ class CloudProcess
         PrcLib.info("Router '%s' created without external Network.",
                     router_name)
       end
-   rescue => e
-     PrcLib.error "Unable to create '%s' router\n%s\n%s", router_name,
-                  e.message, e.backtrace.join("\n")
+    rescue => e
+      PrcLib.error "Unable to create '%s' router\n%s\n%s", router_name,
+                   e.message, e.backtrace.join("\n")
     end
     router
   end
@@ -144,9 +144,9 @@ class CloudProcess
     begin
       #################
       provider_delete_router(net_conn_obj, router_obj)
-   # net_conn_obj.routers.get(router.id).destroy
-   rescue => e
-     PrcLib.error("Unable to delete '%s' router ID", router_id, e)
+    # net_conn_obj.routers.get(router.id).destroy
+    rescue => e
+      PrcLib.error("Unable to delete '%s' router ID", router_id, e)
     end
   end
 
@@ -233,8 +233,8 @@ class CloudProcess
     networks = net_conn_obj
     begin
       netty = networks.get(name)
-   rescue => e
-     PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
+    rescue => e
+      PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
     end
     PrcLib.state("Found gateway '%s'", name) if netty
     PrcLib.state("Unable to find gateway '%s'", name) unless netty

data/lib/process/cloud/process/rules.rb

@@ -79,7 +79,7 @@ class Lorj::BaseDefinition
             #         :delete_e   => :forj_delete_rule
             )
 
-  undefine_attribute :name  # Do not return any predefined name attribute
+  undefine_attribute :name # Do not return any predefined name attribute
 
   obj_needs :CloudObject, :network_connection
   obj_needs :CloudObject, :security_groups, :for => [:create_e]
@@ -87,7 +87,7 @@ class Lorj::BaseDefinition
                                   :extract_from => [:security_groups,
                                                     :attrs, :id]
 
-  obj_needs :data,        :dir,                 :for => [:create_e]
+  obj_needs :data, :dir, :for => [:create_e]
   predefine_data_value :IN,   :desc => 'Input NAT/firewall rule map type'
   predefine_data_value :OUT,  :desc => 'Output NAT/firewall rule map type'
 

data/lib/process/cloud/process/security_groups.rb

@@ -58,7 +58,7 @@ class CloudProcess
         # Need to set runtime data to get or if missing
         # create the required rule.
         params = {}
-        params[:dir]        = :IN
+        params[:dir] = :IN
         params[:proto] = 'tcp'
         params[:port_min]   = portmin.to_i
         params[:port_max]   = portmax.to_i
@@ -111,7 +111,7 @@ class Lorj::BaseDefinition
             )
 
   obj_needs :CloudObject,  :network_connection
-  obj_needs :data,         :security_group,      :for => [:create_e]
+  obj_needs :data,         :security_group, :for => [:create_e]
   obj_needs_optional
   obj_needs :data,         'server#ports',       :for => [:create_e]
   obj_needs :data,         :sg_desc,             :for => [:create_e]

data/lib/process/cloud/process/subnetwork.rb

@@ -58,8 +58,8 @@ class CloudProcess
     begin
       subnet = controller_create(sCloudObj, hParams)
       PrcLib.info("Subnet '%s' created.", subnet[:name])
-   rescue => e
-     PrcLib.fatal(1, "Unable to create '%s' subnet.", name, e)
+    rescue => e
+      PrcLib.fatal(1, "Unable to create '%s' subnet.", name, e)
     end
     subnet
   end
@@ -72,8 +72,8 @@ class CloudProcess
     begin
       provider_delete_subnetwork(net_conn_obj, sub_net_obj)
       net_conn_obj.subnets.get(sub_net_obj.id).destroy
-   rescue => e
-     PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
+    rescue => e
+      PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
     end
   end
 

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

@@ -48,6 +48,7 @@ class HpcloudController # rubocop: disable Metrics/ClassLength
       end
     end
   end
+
   def self.update_method(crud_type)
     define_method(crud_type) do |sObjectType, obj, hParams|
       method_name = "#{crud_type}_#{sObjectType}"
@@ -206,6 +207,7 @@ class HpcloudController # rubocop: disable Metrics/ClassLength
                               hParams[:server])
     end
   end
+
   # rubocop: disable CyclomaticComplexity,
   def get(sObjectType, sUniqId, hParams)
     case sObjectType

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

@@ -56,7 +56,7 @@ class Hpcloud
   def_attr_mapping :external, :router_external
 
   define_obj :rule
-  obj_needs :data, :dir,        :mapping => :direction
+  obj_needs :data, :dir, :mapping => :direction
   attr_value_mapping :IN,  'ingress'
   attr_value_mapping :OUT, 'egress'
 
@@ -75,7 +75,7 @@ class Hpcloud
 
   define_obj :keypairs
 
-  undefine_attribute :id    # Do not return any predefined ID
+  undefine_attribute :id # Do not return any predefined ID
 
   # ************************************ Router Object
   define_obj :router
@@ -118,7 +118,7 @@ class Hpcloud
   define_obj :server_log
 
   # Excon::Response object type
-  def_attr_mapping :output,  'output'
+  def_attr_mapping :output, 'output'
 
   # ************************************* Public IP Object
   define_obj :public_ip

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

@@ -73,11 +73,11 @@ module HPNetwork
     else
       max_value = range_used.max
       new_subnet = max_value.to_i + 1
-      new_cidr  = format('10.0.%s.0/24', new_subnet)
+      new_cidr = format('10.0.%s.0/24', new_subnet)
     end
     new_cidr
- rescue => e
-   Logging.error("%s\n%s", e.message, e.backtrace.join("\n"))
+  rescue => e
+    Logging.error("%s\n%s", e.message, e.backtrace.join("\n"))
   end
 
   # router driver

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

@@ -117,17 +117,17 @@ class MockController
     attributes = oControlerObject
 
     attributes.rh_get(key)
- rescue => e
-   controller_error "Unable to map '%s'.\n%s", key, e.message
+  rescue => e
+    controller_error "Unable to map '%s'.\n%s", key, e.message
   end
 
   def set_attr(oControlerObject, key, value)
     attributes = oControlerObject
 
     attributes.rh_set(value, key)
- rescue => e
-   controller_error "Unable to map '%s' on '%s'.\n%s",
-                    key, sObjectType, e.message
+  rescue => e
+    controller_error "Unable to map '%s' on '%s'.\n%s",
+                     key, sObjectType, e.message
   end
 
   def update(sObjectType, oObject, hParams)

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

@@ -56,7 +56,7 @@ class Openstack
                                               :decrypt => true
   obj_needs :data, 'credentials#auth_uri',    :mapping => :openstack_auth_url
   obj_needs :data, 'credentials#tenant',      :mapping => :openstack_tenant
-  obj_needs :data, 'services#compute',     :mapping => :openstack_region
+  obj_needs :data, 'services#compute', :mapping => :openstack_region
 
   obj_needs_optional # Data required if uri contains v3
   obj_needs :data, :user_domain, :mapping => :openstack_user_domain
@@ -68,7 +68,7 @@ class Openstack
                                               :decrypt => true
   obj_needs :data, 'credentials#auth_uri',    :mapping => :openstack_auth_url
   obj_needs :data, 'credentials#tenant',      :mapping => :openstack_tenant
-  obj_needs :data, 'services#network',     :mapping => :openstack_region
+  obj_needs :data, 'services#network', :mapping => :openstack_region
 
   obj_needs_optional # Data required if uri contains v3
   obj_needs :data, :user_domain, :mapping => :openstack_user_domain
@@ -86,7 +86,7 @@ class Openstack
 
   define_obj :keypairs
 
-  undefine_attribute :id    # Do not return any predefined ID
+  undefine_attribute :id # Do not return any predefined ID
 
   define_obj :server_log
 
@@ -98,7 +98,7 @@ class Openstack
   obj_needs :CloudObject, :tenants
 
   define_obj :rule
-  obj_needs :data, :dir,        :mapping => :direction
+  obj_needs :data, :dir, :mapping => :direction
   attr_value_mapping :IN,  'ingress'
   attr_value_mapping :OUT, 'egress'
 
@@ -460,6 +460,7 @@ class OpenstackController
     end
     build_result(version, body)
   end
+
   # Function to provide a wel formatted standard data, usable by openstack
   # provider
   #

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

@@ -226,7 +226,7 @@ class OpenstackController # :nodoc:
     else
       max_value = range_used.max
       new_subnet = max_value.to_i + 1
-      new_cidr  = format('10.0.%s.0/24', new_subnet)
+      new_cidr = format('10.0.%s.0/24', new_subnet)
     end
     new_cidr
   rescue => e

data/lorj_cloud.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "lorj", ">= 1.0.19"
   spec.add_runtime_dependency 'subhash', '>= 0.1.5'
   spec.add_runtime_dependency "fog", "~> 1.30.0"
+  spec.add_runtime_dependency "net-ssh", "~> 2.9.2"
 
   # Ruby 1.8 restrictions - BEGIN - To be removed at next major release.
   # NOTE that gemspec is used at build time. Do not use RUBY_VERSION check
@@ -37,9 +38,9 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "ruby-debug"
   elsif RUBY_VERSION.match(/1\.9/)
     spec.add_development_dependency "debugger"
-    spec.add_development_dependency "rubocop", "~> 0.30.0"
+    spec.add_development_dependency "rubocop", "~> 0.34.2"
   else
     spec.add_development_dependency "byebug"
-    spec.add_development_dependency "rubocop", "~> 0.30.0"
+    spec.add_development_dependency "rubocop", "~> 0.34.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorj_cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Christophe Larsonneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.30.0
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.2
 description: 'simplify cloud management, thanks to predefined process to manage cloud
   obj and make it work. '
 email:
@@ -229,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Lorj cloud process.