lorj 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913a046318c32edd50058f113100fed25d93075d
-  data.tar.gz: 58fb06cb60adfc5b01682f9c966d23dc82b29ae6
+  metadata.gz: cbe0901bbfa07d90519c83339a77a0e283e205d3
+  data.tar.gz: 813357cfb6091233c16d726148f31745a33bd358
 SHA512:
-  metadata.gz: c5839c30daa322cf69478379d1dc5282eded2fdb34e6d1f0de7a37d8674e25bddc5e850a386467e0573eed6fc56b11a83868d9289441897c763a518d44ec9901
-  data.tar.gz: 8128e5644c561b4fd66456e917cfe5cc3a3c51da5c52b581b352adaa3da8f0714a69a745ec37e982c58bbebccaf849c9399526b4c0a30afbe8764143a77f7020
+  metadata.gz: dcd5cf66499c650e34f0551c43754fb162a6b6dc63dcd0aabec518bfef20d3649b3190ba6b561ef0de70d51b52be1ea6d679d97192496a92318ebc47fa90b66d
+  data.tar.gz: ceb1b16973daa3daaf3093f6093c5aa28d6f4e20639e2afa1133da21d931d4e3acbfd6bd7f6bd6daba2fcce068bbb7b42bad1e6fcc6f6a24f3e049503f495936

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

@@ -32,9 +32,13 @@ class CloudProcess
       router_name = hParams[:router_name]
     end
 
+    _get_router(router_name, sub_net_obj, hParams)
+  end
+
+  def _get_router(router_name, sub_net_obj, hParams)
     router_port = get_router_interface_attached(:port, hParams)
 
-    if router_port.length == 0
+    if router_port.nil? || router_port.length == 0
       # Trying to get router
       router = get_router(router_name)
       router = create_router(router_name) if router.empty?
@@ -188,27 +192,36 @@ class CloudProcess
     end
   end
 
+  # Function to get the router ID in the network
+  # from the list of routers found.
+  # Query ports devices.
   def get_router_interface_attached(sCloudObj, hParams)
     name = hParams[:network, :name]
     PrcLib.state("Searching for router port attached to the network '%s'", name)
-    begin
-      # Searching for router port attached
-      #################
-      query = { :network_id => hParams[
-                               :network, :id],
-                :device_owner => 'network:router_interface' }
-      info = {
-        :notfound => "No router %s for network '%s' found",
-        :checkmatch => 'Found 1 router %s. '\
-                             "Checking exact match for network '%s'.",
-        :nomatch => "No router %s for network '%s' match",
-        :found => "Found router %s ID %s attached to network '#{name}'.",
-        :more => "Found several router %s. Searching for network '%s'.",
-        :items => [:id]
-      }
-      query_single(sCloudObj, query, name, info)
-    rescue => e
-      PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
+    routers = controller_query(:router, {})
+    routers.each do |router|
+      begin
+        router_name = router[:name]
+        # Searching for router port attached
+        #################
+        query = { :network_id => hParams[:network, :id],
+                  :device_id => router[:id] }
+        info = {
+          :notfound => "Network '#{name}' not attached to router "\
+                       "'#{router_name}'",
+          :checkmatch => 'Found 1 router %s. '\
+                               "Checking exact match for network '%s'.",
+          :nomatch => "No router %s for network '%s' match",
+          :found => "Found router %s ID (#{router_name}) %s attached to "\
+                    "network '#{name}'.",
+          :more => "Found several router %s. Searching for network '%s'.",
+          :items => [:id]
+        }
+        interfaces = query_single(sCloudObj, query, name, info)
+        return interfaces unless interfaces.length == 0
+      rescue => e
+        PrcLib.error("%s\n%s", e.message, e.backtrace.join("\n"))
+      end
     end
   end
 

data/lib/lorj/version.rb

@@ -16,5 +16,5 @@
 
 # Lorj version
 module Lorj
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/lib/providers/openstack/openstack.rb

@@ -316,14 +316,18 @@ class OpenstackController
                        oControlerObject.class,
                        oControlerObject.class.attributes unless
                        oControlerObject.class.attributes.include?(key[0])
-
       return attributes.rh_get(key) if attributes.rh_exist?(key)
-      return oControlerObject.send(key[0]) if key.length == 1
-      oControlerObject.send(key[0]).rh_get(key[1..-1])
+      _get_instance_attr(oControlerObject, key)
     end
   rescue => e
     controller_error "==>Unable to map '%s'. %s", key, e.message
   end
+
+  def _get_instance_attr(oControlerObject, key)
+    return nil if oControlerObject.send(key[0]).nil?
+    return oControlerObject.send(key[0]) if key.length == 1
+    oControlerObject.send(key[0]).rh_get(key[1..-1])
+  end
 end
 
 # Following class describe how FORJ should handle Openstack Cloud objects.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorj
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler