oraclecloud 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 114f5803f4c77b8c23858167d333564ced2961d0
-  data.tar.gz: 958dad16f17017b1210ce926f224b59619fff360
+  metadata.gz: fb91dc27431a829a92b8410ee1176a4c0e3652d4
+  data.tar.gz: 0d55cb121a613f2fd488b9c5730a9740d5e77ec5
 SHA512:
-  metadata.gz: 337eebb3ff3423dc93cceb7481896a08e20bb21fca8f6b387da4a0bc80cb917bf3458ff574909ddf4a4438139f03da2948f3f67dc5656234bed3af406cccf01d
-  data.tar.gz: be3492b4887cfebc5f4542ec254a091cae1aadf998e4ac3aa31f00b71df5ea0bc6885d1322b983b5423b993461f0775d4eb60619eb74f05e741ec04e8c16071c
+  metadata.gz: 11e4eff48cbc99ec3fe94f7783383947b34c5d85ee7e8311459a5c9557462c04f966b581fc0c5b1fdda03aa2b89c9bece193a6c0341f41d4545bb523479f4dca
+  data.tar.gz: 6058dafde29ca9173ab44414a2869d659f7bf72300ec99a101fef27227b797d33e2f82d6b8974bff2e075a8b7dc40adf7276a5d9baad362400c669bae6afbc0f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # oraclecloud client gem CHANGELOG
 
+## v1.1.0 (2015-11-12)
+* [pr#4](https://github.com/chef-partners/oracle-cloud-client/pull/4) Added support for non-public deployments of Oracle Cloud where the identity domain follows a different convention
+
 ## v1.0.0 (2015-10-15)
 * Initial release
 

data/lib/oraclecloud/client.rb

@@ -17,6 +17,7 @@
 #
 
 require 'ffi_yajl'
+require 'json'
 require 'rest-client'
 
 module OracleCloud
@@ -26,6 +27,7 @@ module OracleCloud
     def initialize(opts)
       @api_url         = opts[:api_url]
       @identity_domain = opts[:identity_domain]
+      @private_cloud   = opts[:private_cloud] || false
       @username        = opts[:username]
       @password        = opts[:password]
       @verify_ssl      = opts.fetch(:verify_ssl, true)
@@ -86,12 +88,20 @@ module OracleCloud
       false
     end
 
+    def private_cloud?
+      @private_cloud
+    end
+
     def username_with_domain
-      "#{compute_identity_domain}/#{@username}"
+      "#{full_identity_domain}/#{@username}"
     end
 
-    def compute_identity_domain
-      "Compute-#{@identity_domain}"
+    def full_identity_domain
+      if private_cloud?
+        @identity_domain
+      else
+        "Compute-#{@identity_domain}"
+      end
     end
 
     def authenticate!
@@ -168,7 +178,7 @@ module OracleCloud
     end
 
     def url_with_identity_domain(type, path = '')
-      "/#{type}/#{compute_identity_domain}/#{path}"
+      "/#{type}/#{full_identity_domain}/#{path}"
     end
 
     def http_get(request_type, url)

data/lib/oraclecloud/instance_request.rb

@@ -48,7 +48,7 @@ module OracleCloud
     end
 
     def full_name
-      "#{client.compute_identity_domain}/#{client.username}/#{name}"
+      "#{client.full_identity_domain}/#{client.username}/#{name}"
     end
 
     def nat

data/lib/oraclecloud/orchestrations.rb

@@ -35,9 +35,9 @@ module OracleCloud
 
     def create_request_payload
       {
-        'name' => "#{client.compute_identity_domain}/#{client.username}/#{create_opts[:name]}",
+        'name' => "#{client.full_identity_domain}/#{client.username}/#{create_opts[:name]}",
         'relationships' => [],
-        'account' => "#{client.compute_identity_domain}/default",
+        'account' => "#{client.full_identity_domain}/default",
         'description' => create_opts[:description],
         'schedule' => { 'start_time' => nil, 'stop_time' => nil },
         'uri' => nil,

data/lib/oraclecloud/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 #
 module OracleCloud
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oraclecloud
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client