cumulogic_client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzk1ZWUwOTc1NWVlOGJhMjJiMzMzZTFlNmIwYTlhOWNkN2EyZTJiNg==
+    OGM0OTUzZWIzZTdjMzA4Y2Q5ODQ0NjNmZGJmM2RkYzEyMzI3ZGY4OA==
   data.tar.gz: !binary |-
-    NGViYTVmYmVjNDhmN2QzYWVjNjBmZTE5N2ZiMTA5NzBlZDNiN2ViNw==
+    MmRiNzI3ZWE4NWY4MGYyMTRlMTEwYzZiZTZjNTIzOTE2NTNhYWE5MA==
 SHA512:
   metadata.gz: !binary |-
-    YjczODQxYmU5YzVkMTk4NzM0YmMxYmFlNjZjYjdiYjlkMmRmMWE2MjM0YTlh
-    MjMyZTEzZWE0ZTRiMTZjYTQ0N2NiMDM2NGM2NzE5YTZkZDRiNmQ1Y2UyMjhh
-    OGUyMjNkM2QwYjc0NGVkYzQwOWVhMDFiNTBlYmU1NmFjNmVlNjI=
+    MDdiNTY3MTI5NGZlNWU5N2FiMGU2NGU2M2MyNDczMjZhODUwNmY4YjllYmY3
+    Zjk4MmVlYzczNDQ5ODVjZWM2NzRkZDUwMWI2ZjRhMjE1NDE3MTU2YjdmY2Y3
+    NTllODJjNTU2Mzc4MjU1YjI3ZWUxZjFhZDViM2M0YTY5Yzk4OTQ=
   data.tar.gz: !binary |-
-    ZGI0YTI5ZWZlMGIxMDFlNjU1YjFiZTAxOWYxNmZmYWIyYWYzYjczMjcwZWVi
-    MzgzNjdiZGE4ZGIzNWNkNDAwNGFmYmU5OTg3MDYyOWNkNDlkZDI2YTVhYzJh
-    M2E5NjE5NTc2OWZhMDc1YzE1ZjFmNjE2YmNmNDNmODAyOTk4YjU=
+    MjljMjIwZTE2MDJhYjVmOGQ4MzY1YjU5NjY3ZDVjYTUxNTFmYjE4MGY1Njg5
+    Yzk5YTRkMzUxMTM3ZWVmOTIyYzhkYWFkOTBlOTdhNjVhZTMyZjM4OTRiZGEz
+    MTc0MmQzYjg2ZTI4NGYxMzViYjBhYzY4ODQwYmY2Nzk0NjkxYjE=

data/lib/cumulogic_client.rb

@@ -15,3 +15,6 @@
 
 Dir[File.join(File.dirname(__FILE__), 'cumulogic_client/*.rb')].sort.each { |rb| require rb }
 
+module CumulogicClient
+
+end

data/lib/cumulogic_client/base_client.rb

@@ -1,4 +1,3 @@
-# Copyright 2014 CumuLogic, Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,84 +13,88 @@
 
 require 'timeout'
 
-class CumulogicClient::BaseClient
-  def initialize(api_url, username, password, use_ssl=nil, debug=false)
-    @api_url  = api_url
-    @username = username
-    @password = password
-    @use_ssl  = use_ssl
-    @debug    = debug
-    @validationparams = nil
-  end
+module CumulogicClient
 
-  def call(command, params=nil)
-    login() if not @validationparams
-    callparams = Hash.new()
-    callparams[:inputParams] = Array.new(1)
-    callparams[:inputParams][0] = params if params
-    callparams[:validationParams] = @validationparams
-    request(command, callparams)
-  end
-  
-  def request(command, params=nil)
-    url = "#{@api_url}#{command}"
-    puts url if @debug
-    puts params.to_json if @debug
-    uri = URI.parse(url)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = @use_ssl
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Post.new(uri.request_uri)
-    request.body = URI::encode(params.to_json) if params
-    response = http.request(request)
+  class CumulogicClient::BaseClient
+    def initialize(api_url, username, password, use_ssl=nil, debug=false)
+      @api_url  = api_url
+      @username = username
+      @password = password
+      @use_ssl  = use_ssl
+      @debug    = debug
+      @validationparams = nil
+    end
 
-    if !response.is_a?(Net::HTTPOK)
-      if ["431","530","404"].include?(response.code)
-        raise ArgumentError, response.message
-      end
-      raise RuntimeError, "Username and password not accepted" if ["401","403"].include?(response.code)
-      raise RuntimeError, "Unknown error: code=#{response.code} message=#{response.message}"
+    def call(command, params=nil)
+      login() if not @validationparams
+      callparams = Hash.new()
+      callparams[:inputParams] = Array.new(1)
+      callparams[:inputParams][0] = params if params
+      callparams[:validationParams] = @validationparams
+      request(command, callparams)
     end
 
-    puts response.body if @debug
+    def request(command, params=nil)
+      url = "#{@api_url}#{command}"
+      puts url if @debug
+      puts params.to_json if @debug
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = @use_ssl
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Post.new(uri.request_uri)
+      request.body = URI::encode(params.to_json) if params
+      response = http.request(request)
 
-    responsedata = JSON.parse(response.body)
+      if !response.is_a?(Net::HTTPOK)
+        if ["431","530","404"].include?(response.code)
+          raise ArgumentError, response.message
+        end
+        raise RuntimeError, "Username and password not accepted" if ["401","403"].include?(response.code)
+        raise RuntimeError, "Unknown error: code=#{response.code} message=#{response.message}"
+      end
 
-    raise RuntimeError, "Errors: #{responsedata["errors"]}" if not responsedata["success"]
-    return responsedata["response"]
+      puts response.body if @debug
 
-  end
+      responsedata = JSON.parse(response.body)
 
-  def login()
-    credentials = Array.new(1)
-    credentials[0] = {
-      "userName" => @username,
-      "password" => @password
-    }
-    login_params = Hash.new
-    login_params["validationParams"] = Hash.new
-    login_params["inputParams"] = credentials
-    loginresponse = request("auth/login", login_params)
-    @validationparams = {
-      "userID" => loginresponse[0]["userID"],
-      "userName" => loginresponse[0]["userName"],
-      "userLoginToken" => loginresponse[0]["userLoginToken"]
-    }
+      raise RuntimeError, "Errors: #{responsedata["errors"]}" if not responsedata["success"]
+      return responsedata["response"]
 
-  end
+    end
+
+    def login()
+      credentials = Array.new(1)
+      credentials[0] = {
+        "userName" => @username,
+        "password" => @password
+      }
+      login_params = Hash.new
+      login_params["validationParams"] = Hash.new
+      login_params["inputParams"] = credentials
+      loginresponse = request("auth/login", login_params)
+      @validationparams = {
+        "userID" => loginresponse[0]["userID"],
+        "userName" => loginresponse[0]["userName"],
+        "userLoginToken" => loginresponse[0]["userLoginToken"]
+      }
 
-  def provisioning_completed(targetobject, timeout=nil)
-    return Timeout::timeout(timeout) do
-      while true do
-         if not targetobject.isComplete()
-           puts "returned false"
-           sleep 10
-         else 
-           puts "returned true"
-           return true
-         end
+    end
+
+    def provisioning_completed(targetobject, timeout=nil)
+      return Timeout::timeout(timeout) do
+        while true do
+          if not targetobject.isComplete()
+            puts "returned false"
+            sleep 10
+          else 
+            puts "returned true"
+            return true
+          end
+        end
       end
     end
+
   end
 
 end

data/lib/cumulogic_client/nosql.rb

@@ -12,80 +12,82 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class CumulogicClient::Nosql
-  def initialize(api_url, username, password, use_ssl=nil, debug=false)
-    @client = CumulogicClient::BaseClient.new(api_url, username, password, use_ssl, debug)
-  end
+module CumulogicClient
+  class Nosql
+    def initialize(api_url, username, password, use_ssl=nil, debug=false)
+      @client = CumulogicClient::BaseClient.new(api_url, username, password, use_ssl, debug)
+    end
 
-  def engine_list()
-    return @client.call('nosql/nosqlengine/list')
-  end
+    def engine_list()
+      return @client.call('nosql/nosqlengine/list')
+    end
 
-  def list()
-    return @client.call('nosql/instance/list')
-  end
+    def list()
+      return @client.call('nosql/instance/list')
+    end
 
-  def events(instanceId)
-    params = {
-      'noSqlInstanceId' => instanceId
-    }
-    return @client.call('nosql/instance/showEvents', params)
-  end
+    def events(instanceId)
+      params = {
+        'noSqlInstanceId' => instanceId
+      }
+      return @client.call('nosql/instance/showEvents', params)
+    end
 
-  def delete(instanceId)
-    params = {
-      'noSqlInstanceId' => instanceId
-    }
-    return @client.call('nosql/instance/deleteNoSqlInstance', params)
-  end
+    def delete(instanceId)
+      params = {
+        'noSqlInstanceId' => instanceId
+      }
+      return @client.call('nosql/instance/deleteNoSqlInstance', params)
+    end
 
-  def create(spec)
-    response = @client.call('nosql/instance/createNoSqlInstance', spec.to_hash)
-    @newInstanceId = response[0]['noSqlInstanceId']
-    @client.provisioning_completed(self, 30)
-    return @newInstanceId
-  end
+    def create(spec)
+      response = @client.call('nosql/instance/createNoSqlInstance', spec.to_hash)
+      @newInstanceId = response[0]['noSqlInstanceId']
+      @client.provisioning_completed(self, 30)
+      return @newInstanceId
+    end
 
-  def isComplete()
-    instances = self.list()
-    puts instances
-    target = instances.select { |id| id["noSqlInstanceId"] = @newInstanceId }
-    return false if (target[0]["status"] == 2)
-    raise RuntimeError, "Error provisioning instance: #{target[0]["errorMessage"]}" if (target[0]["status"] == 3)
-    return true
-  end
+    def isComplete()
+      instances = self.list()
+      puts instances
+      target = instances.select { |id| id["noSqlInstanceId"] = @newInstanceId }
+      return false if (target[0]["status"] == 2)
+      raise RuntimeError, "Error provisioning instance: #{target[0]["errorMessage"]}" if (target[0]["status"] == 3)
+      return true
+    end
 
-  NoSQLSpec = Class.new do
-    attr_accessor :name
-    attr_accessor :description
-    attr_accessor :nodes
-    attr_accessor :collectionName
-    attr_accessor :characterSet
-    attr_accessor :port
-    attr_accessor :noSqlEngineId
-    attr_accessor :targetCloudId
-    attr_accessor :availabilityZoneName
-    attr_accessor :instanceTypeId
-    attr_accessor :serviceTag
-    attr_accessor :accessGroupId
-    attr_accessor :noSqlParamGroupId
-    attr_accessor :storageSize
-    attr_accessor :isbackupPreferenceSet
-    attr_accessor :isAutoUpdateEnabled
-    attr_accessor :backupRetentionPeriod
-    attr_accessor :backupStartTime
-    attr_accessor :ownerType
-    attr_accessor :isAvailabilityZoneMandatory
-    attr_accessor :isInstanceTypeMandatory
-    attr_accessor :availabilityZone
-    attr_accessor :isVolumeSizeMandatory
-    attr_accessor :backupRetentionPeriod
-    attr_accessor :backupStartTime
-    attr_accessor :start
+    NoSQLSpec = Class.new do
+      attr_accessor :name
+      attr_accessor :description
+      attr_accessor :nodes
+      attr_accessor :collectionName
+      attr_accessor :characterSet
+      attr_accessor :port
+      attr_accessor :noSqlEngineId
+      attr_accessor :targetCloudId
+      attr_accessor :availabilityZoneName
+      attr_accessor :instanceTypeId
+      attr_accessor :serviceTag
+      attr_accessor :accessGroupId
+      attr_accessor :noSqlParamGroupId
+      attr_accessor :storageSize
+      attr_accessor :isbackupPreferenceSet
+      attr_accessor :isAutoUpdateEnabled
+      attr_accessor :backupRetentionPeriod
+      attr_accessor :backupStartTime
+      attr_accessor :ownerType
+      attr_accessor :isAvailabilityZoneMandatory
+      attr_accessor :isInstanceTypeMandatory
+      attr_accessor :availabilityZone
+      attr_accessor :isVolumeSizeMandatory
+      attr_accessor :backupRetentionPeriod
+      attr_accessor :backupStartTime
+      attr_accessor :start
 
-    def to_hash
-      Hash[*instance_variables.map { |v| [v.to_s().tr("@", ""), instance_variable_get(v)] }.flatten]
+      def to_hash
+        Hash[*instance_variables.map { |v| [v.to_s().tr("@", ""), instance_variable_get(v)] }.flatten]
+      end
     end
-  end
 
+  end
 end

data/lib/cumulogic_client/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module CumulogicClient
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/base_client_spec.rb

@@ -31,7 +31,4 @@ describe "base_client" do
   it "can get DB engine list" do
     @client.call("dbaas/dbengine/list")
   end
-  it "can get instance types" do
-    @client.listInstanceTypes("Zone#1")
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cumulogic_client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Chip Childers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler