openstack-router 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e4ca3bc4dc4784bbde2456f6c8f345066529d4c9451885f07c1b20e2094cb41
-  data.tar.gz: 781556f8136ece2e07fdce30788aa9af2be3fb14a005228a3ed0adac96d7dfe1
+  metadata.gz: c0f75a1372ca48807478db771b5cef9e87dcf6692b1d996b83b79a46e1e5e094
+  data.tar.gz: 45c8b6994b400d5f00e812faa71100680dbabb0810284492f84fc77ea0a2d1cf
 SHA512:
-  metadata.gz: b095cdc56abd579f074f5e2a1566b833b242328715bd2f24c8a4268ae19edf90f44ec607291a1942e52d42a34d28797b9d67195e892e93ceec507b278df4eecc
-  data.tar.gz: 3dcfb962b7edd53cd5ee6f22e39029ec42fd2a92d30ff8cf01f4e2da93d5466c56f492e96c2ab0610e332591917cd2377efef04ebb84918b634128061970da72
+  metadata.gz: 8bf430ddb4daced99473fea95d448f9da4877810e3ac26d53a88bd6a30d873d1c8aee9220032831c3a1f1a02203b653973a150bb6e1d9a079a703830691901f9
+  data.tar.gz: a9e6948efba2df9bc0106c16cb50d1d2d3f7a4d56d2acb85fd1960fefbb27bb87e76fb6023cb04b6f19c4042e4770bbae6483b0ffc0f67c7b93801fafeedbacd

data/lib/openstack-router/parameter/connection.rb

@@ -21,18 +21,21 @@ module OpenStackRouter
       attr_reader :username
       attr_reader :api_key
       attr_reader :tenant
-      attr_reader :project_id
+      attr_reader :tenant_id
       attr_reader :region
 
       # The mandatory options needed to be pass in argument at initialization of that class.
-      MANDATORY_OPTIONS = %i[auth_url username api_key tenant project_id].freeze
+      MANDATORY_OPTIONS = %i[auth_url username api_key].freeze
+      # Paired mandatory options (means that one of one pair must me present, not the other).
+      PAIRED_MANDATORY_OPTIONS = [%i[tenant tenant_id]].freeze
       # The options that are not mandatory for this object.
       OTHER_OPTIONS = %i[region].freeze
       # Constant containing all the available options.
-      ALL_OPTIONS = (MANDATORY_OPTIONS + OTHER_OPTIONS).freeze
+      ALL_OPTIONS = (MANDATORY_OPTIONS + PAIRED_MANDATORY_OPTIONS.flatten + OTHER_OPTIONS).freeze
 
       def initialize(options)
         mandatory_options(options)
+        paired_mandatory_options(options)
         other_options(options)
       end
 
@@ -68,7 +71,7 @@ module OpenStackRouter
       attr_writer :username
       attr_writer :api_key
       attr_writer :tenant
-      attr_writer :project_id
+      attr_writer :tenant_id
       attr_writer :region
 
       def mandatory_options(cfg)
@@ -83,6 +86,20 @@ module OpenStackRouter
         raise ArgumentError, "Missing keys: #{missing_keys}" unless missing_keys.empty?
       end
 
+      def paired_mandatory_options(cfg)
+        missing_keys = []
+        PAIRED_MANDATORY_OPTIONS.each do |key1, key2|
+          if cfg.key? key1
+            send("#{key1}=".to_sym, cfg[key1])
+          elsif cfg.key? key2
+            send("#{key2}=".to_sym, cfg[key2])
+          else
+            missing_keys.append([key1, key2])
+          end
+        end
+        raise ArgumentError, "Missing paired keys: #{missing_keys}" unless missing_keys.empty?
+      end
+
       def other_options(cfg)
         cfg.each do |key, value|
           send("#{key}=".to_sym, value) if OTHER_OPTIONS.include?(key)

data/lib/openstack-router/version.rb

@@ -2,5 +2,5 @@
 
 module OpenStackRouter
   # The version number of this library
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstack-router
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Roland Laurès
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack