ocs 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 577b3c6848ab14e6b0955816682d593cac6dd8ec
-  data.tar.gz: 95055bd21dac7c1cfbfb993685322cf12c17866d
+  metadata.gz: 930d79abb1e657b74654c2b85f3a0d4189e2b3d5
+  data.tar.gz: 2a407305940592e09f836cff4958dc9ef1ad6c82
 SHA512:
-  metadata.gz: 0783b506af579edc04433a27020c802e0d8b57fa15aab815e658d4dfe0416af632963f72fc075bcac3f008c5d2e31724afb713875e11fbde38344ead96ddf526
-  data.tar.gz: 967915519022b16e200e4a7497956ed21233e30f7c111a12151900edf7c556ce8a02076e54624dd5d2af0913aa8fa41cf35481658c9f85f81ef6bf5b56e8f086
+  metadata.gz: f7d19e2f35dbc4c173414c33d1a33c773dc58760a42a5247a6d0ea33ded8e23738f3b430483c57f0db1979ce8a2d1346ee0985ea6a2d218fa801bd2089a752ef
+  data.tar.gz: d9403441d146cd9ab773ee9e0c647a3b7540643d9f0319bcc93a4a082e33ffcf5f1a80447201b73062682784bb9b15f2a8988404adab19fa0df865dfb4f2928c

data/lib/ocs.rb

@@ -13,6 +13,7 @@ module Ocs
   class OcsError < StandardError; end
 end
 
+require "ocs/api_error"
 require "ocs/client"
 require "ocs/request"
 require "ocs/resources"

data/lib/ocs/api_error.rb

@@ -0,0 +1,35 @@
+module Ocs
+  class ApiError < OcsError
+    attr_reader :api, :parameters, :error_response
+
+    def initialize(api, parameters, error_response)
+      @api = api
+      @parameters = parameters
+      @error_response = error_response
+    end
+
+    def error_code
+      error_response.content[:cserrorcode]
+    end
+
+    def error_text
+      error_response.content[:errortext]
+    end
+
+    def message
+      {
+        api: api,
+        parameters: parameters,
+        error_response: error_response.raw_body
+      }
+    end
+
+    def status_code
+      error_response.content[:errorcode]
+    end
+
+    def to_s
+      "[#{error_code}] #{error_text}"
+    end
+  end
+end

data/lib/ocs/client.rb

@@ -1,18 +1,18 @@
 module Ocs
   class Client
-    attr_reader :api_key, :host, :path, :secret_key, :logger
+    attr_reader :api_key, :host, :path, :secret_key, :logger, :ssl
 
-    def initialize(host:, api_key:, secret_key:, path: "/client/api", logger: nil)
+    def initialize(host:, api_key:, secret_key:, path: "/client/api", logger: nil, ssl: true)
       @host       = host
       @api_key    = api_key
       @secret_key = secret_key
       @path       = path
       @logger     = logger
+      @ssl        = ssl
     end
 
     def call(name, options = {})
-      send(name, options)
-        .body["#{name.downcase.pluralize}response"]
+      send(name, options).content
     end
 
     def connection
@@ -42,7 +42,11 @@ module Ocs
     end
 
     def url_prefix
-      "https://#{host}"
+      "#{url_protocol}://#{host}"
+    end
+
+    def url_protocol
+      ssl ? "https" : "http"
     end
 
     def method_missing(method, *args)

data/lib/ocs/resources.rb

@@ -10,6 +10,7 @@ module Ocs
     autoload :Group,           "ocs/resources/group"
     autoload :Host,            "ocs/resources/host"
     autoload :Iso,             "ocs/resources/iso"
+    autoload :Network,         "ocs/resources/network"
     autoload :Nic,             "ocs/resources/nic"
     autoload :OsType,          "ocs/resources/os_type"
     autoload :ResourceDetail,  "ocs/resources/resource_detail"

data/lib/ocs/resources/async_job.rb

@@ -1,8 +1,28 @@
 module Ocs
-  module Resource
+  module Resources
     class AsyncJob < Base
       define_attribute :jobid, type: String
       define_attribute :jobstatus, type: Integer
+
+      def done?
+        reload!
+        jobstatus != 0
+      end
+
+      def failed?
+        reload!
+        jobstatus == 2
+      end
+
+      def success?
+        reload!
+        jobstatus == 1
+      end
+
+      def reload!
+        res = client.call("queryAsyncJobResult", jobid: jobid)
+        self.jobstatus = res[:jobstatus]
+      end
     end
   end
 end

data/lib/ocs/resources/base.rb

@@ -19,6 +19,10 @@ module Ocs
           name.downcase
         end
 
+        def inherited(sub_class)
+          sub_class.delegations = {}
+        end
+
         def name
           to_s.split(/::/).last
         end
@@ -32,8 +36,13 @@ module Ocs
         end
 
         def list(client, parameters = {})
-          client.call("list#{pluralized_name}", parameters)[downcased_name].map do |attributes|
-            new(client, attributes)
+          response = client.call("list#{pluralized_name}", parameters)
+          if response.empty?
+            []
+          else
+            response[downcased_name].map do |attributes|
+              new(client, attributes)
+            end
           end
         end
 
@@ -61,10 +70,10 @@ module Ocs
         end
 
         def define_action(action_name, required: [], optional: [], api_name: nil)
-          define_method(action_name) do
+          define_method(action_name) do |special_parameters = {}|
             api = api_name || "#{action_name}#{self.class.name}"
-            parameters = action_parameters(required, optional)
-            client.call(api, parameters)
+            parameters = action_parameters(required, optional).merge(special_parameters)
+            send_and_update(api, parameters)
           end
         end
 
@@ -143,12 +152,20 @@ module Ocs
 
       define_attribute :id, type: String
 
-      attr_reader :client
+      attr_reader :client, :error
 
       def initialize(client, raw_hash = {})
         @client   = client
         @raw_hash = raw_hash
-        update_attributes(raw_hash)
+        update_attributes!(raw_hash)
+      end
+
+      def reload!
+        response = client.call("list#{self.class.pluralized_name}", id: id)[self.class.downcased_name]
+        if response && !response.empty?
+          update_attributes!(response.first)
+        end
+        self
       end
 
       private
@@ -160,14 +177,17 @@ module Ocs
 
       def check_required_keys(required_keys)
         required_keys.each do |key|
+          key = key[:attribute] if key.is_a?(Hash)
           raise MissingKeyError.new("#{key} key is required") if public_send(key).nil?
         end
       end
 
       def parameters(keys)
         keys.inject({}) do |params, key|
-          value = public_send(key)
-          params[key.to_s.delete("_")] = value if value
+          attribute_name = key.is_a?(Hash) ? key[:attribute] : key
+          request_key = key.is_a?(Hash) ? key[:as].to_s : key.to_s.delete("_")
+          value = public_send(attribute_name)
+          params[request_key] = value if value
           params
         end
       end
@@ -176,7 +196,19 @@ module Ocs
         "ocs/resources/#{class_name}".camelize.constantize
       end
 
-      def update_attributes(hash)
+      def send_and_update(api, parameters)
+        response = client.send(api, parameters)
+        if response.success?
+          @error = nil
+          update_attributes!(response.content)
+          true
+        else
+          @error = ApiError.new(api, parameters, response)
+          false
+        end
+      end
+
+      def update_attributes!(hash)
         hash.each do |key, value|
           if delegations.has_key?(key.to_sym)
             public_send(delegations[key.to_sym], value)

data/lib/ocs/resources/domain.rb

@@ -1,7 +1,15 @@
 module Ocs
   module Resources
     class Domain < Base
+      has_one :domain
+
+      define_attribute :haschild, type: BOOLEAN
+      define_attribute :level, type: Integer
       define_attribute :name, type: String
+      define_attribute :path, type: String
+
+      delegate_attribute :parentdomainid,   to: :domain, as: :id
+      delegate_attribute :parentdomainname, to: :domain, as: :name
     end
   end
 end

data/lib/ocs/resources/network.rb

@@ -0,0 +1,59 @@
+module Ocs
+  module Resources
+    class Network < Base
+      has_one :domain
+      has_one :project
+      has_one :zone
+
+      has_many :tags
+
+      define_attribute :account, type: String
+      define_attribute :aclid, type: String
+      define_attribute :acltype, type: String
+      define_attribute :broadcastdomaintype, type: String
+      define_attribute :broadcasturi, type: String
+      define_attribute :canusefordeploy, type: BOOLEAN
+      define_attribute :cidr, type: String
+      define_attribute :displaynetwork, type: BOOLEAN
+      define_attribute :displaytext, type: String
+      define_attribute :dns1, type: String
+      define_attribute :dns2, type: String
+      define_attribute :gateway, type: String
+      define_attribute :ip6cidr, type: String
+      define_attribute :ip6gateway, type: String
+      define_attribute :isdefault, type: BOOLEAN
+      define_attribute :ispersistent, type: BOOLEAN
+      define_attribute :issystem, type: BOOLEAN
+      define_attribute :name, type: String
+      define_attribute :netmask, type: String
+      define_attribute :networkcidr, type: String
+      define_attribute :networkdomain, type: String
+      define_attribute :networkofferingavailability, type: String
+      define_attribute :networkofferingconservemode, type: BOOLEAN
+      define_attribute :networkofferingdisplaytext, type: String
+      define_attribute :networkofferingid, type: String
+      define_attribute :networkofferingname, type: String
+      define_attribute :physicalnetworkid, type: String
+      define_attribute :related, type: String
+      define_attribute :reservediprange, type: String
+      define_attribute :restartrequired, type: BOOLEAN
+      define_attribute :service, type: Array
+      define_attribute :specifyipranges, type: BOOLEAN
+      define_attribute :state, type: String
+      define_attribute :subdomainaccess, type: BOOLEAN
+      define_attribute :traffictype, type: String
+      define_attribute :type, type: String
+      define_attribute :vlan, type: String
+      define_attribute :vpcid, type: String
+
+      delegate_attribute :domain,   to: :domain, as: :name
+      delegate_attribute :domainid, to: :domain, as: :id
+      delegate_attribute :project,   to: :project, as: :name
+      delegate_attribute :projectid, to: :project, as: :id
+      delegate_attribute :zoneid,   to: :zone, as: :id
+      delegate_attribute :zonename, to: :zone, as: :name
+
+      delegate_attributes :tags, to: :tags
+    end
+  end
+end

data/lib/ocs/resources/nic.rb

@@ -1,6 +1,8 @@
 module Ocs
   module Resources
     class Nic < Base
+      has_one :network
+
       define_attribute :broadcasturi, type: String
       define_attribute :gateway, type: String
       define_attribute :ipaddress, type: String
@@ -12,6 +14,9 @@ module Ocs
       define_attribute :networkname, type: String
       define_attribute :traffictype, type: String
       define_attribute :type, type: String
+
+      delegate_attribute :networkid, to: :network, as: :id
+      delegate_attribute :networkname, to: :network, as: :name
     end
   end
 end

data/lib/ocs/resources/resource_detail.rb

@@ -0,0 +1,10 @@
+module Ocs
+  module Resources
+    class ResourceDetail < Base
+      define_attribute :type, type: String
+
+      alias_attribute :resourceid, :id
+      alias_attribute :resourcetype, :type
+    end
+  end
+end

data/lib/ocs/resources/ssh_key_pair.rb

@@ -1,6 +1,13 @@
 module Ocs
   module Resources
     class SshKeyPair < Base
+      class << self
+        def name
+          "SSHKeyPair"
+        end
+      end
+
+      define_attribute :fingerprint, type: String
       define_attribute :name, type: String
     end
   end

data/lib/ocs/resources/tag.rb

@@ -10,7 +10,7 @@ module Ocs
       define_attribute :value, type: String
       define_attribute :resourcetype, type: String
 
-      delegate_attribute :acount, to: :account, as: :name
+      delegate_attribute :account, to: :account, as: :name
       delegate_attribute :domain,   to: :domain, as: :name
       delegate_attribute :domainid, to: :domain, as: :id
       delegate_attribute :project,   to: :project, as: :id

data/lib/ocs/resources/virtual_machine.rb

@@ -3,6 +3,7 @@ module Ocs
     class VirtualMachine < Base
       has_one :account
       has_one :address
+      has_one :async_job
       has_one :disk_offering
       has_one :domain
       has_one :group
@@ -34,7 +35,7 @@ module Ocs
       #define_attribute :forvirtualnetwork
       define_attribute :haenable, type: BOOLEAN
       define_attribute :hypervisor, type: String
-      #define_attribute :instancename
+      define_attribute :instancename, type: String
       define_attribute :isdynamicallyscalable, type: BOOLEAN
       define_attribute :memory, type: Integer
       define_attribute :name, type: String
@@ -65,8 +66,8 @@ module Ocs
       delegate_attribute :jobstatus, to: :async_job, as: :jobstatus
       delegate_attribute :keypair, to: :ssh_key_pair, as: :name
       delegate_attribute :ostypeid, to: :os_type, as: :id
-      #delegate_attribute :project,   to: :project, as: :name
-      #delegate_attribute :projectid, to: :project, as: :id
+      delegate_attribute :project,   to: :project, as: :name
+      delegate_attribute :projectid, to: :project, as: :id
       delegate_attribute :publicip,   to: :address, as: :id
       delegate_attribute :publicipid, to: :address, as: :id
       delegate_attribute :serviceofferingid,   to: :service_offering, as: :id
@@ -84,7 +85,38 @@ module Ocs
 
       define_action :deploy,
         required: %i(service_offering_id template_id zone_id),
-        optional: %i(displayname group_name name)
+        optional: %i(displayname name displayvm) + [
+          {attribute: :group_name, as: :group},
+          {attribute: :ssh_key_pair_name, as: :keypair}
+        ]
+
+      def destroyed?
+        state == "Destroyed"
+      end
+
+      def running?
+        state == "Running"
+      end
+
+      def starting?
+        state == "Starting"
+      end
+
+      def stopped?
+        state == "Stopped"
+      end
+
+      def add_nic(network:, ipaddress: nil)
+        network_id = network.is_a?(Resources::Base) ? network.id : network
+        parameters = {networkid: network_id, virtualmachineid: id}
+        parameters[:ipaddress] = ipaddress if ipaddress
+        send_and_update("addNicToVirtualMachine", parameters)
+      end
+
+      def remove_nic(nic:)
+        parameters = {nicid: nic.id, virtualmachineid: id}
+        send_and_update("removeNicFromVirtualMachine", parameters)
+      end
     end
   end
 end

data/lib/ocs/response.rb

@@ -1,17 +1,27 @@
 module Ocs
   class Response
+    attr_reader :raw_body
+
     def initialize(faraday_response)
-      @raw_body    = faraday_response.body
+      @raw_body    = faraday_response.body.with_indifferent_access
       @raw_headers = faraday_response.headers
       @raw_status  = faraday_response.status
     end
 
-    def body
-      @body ||= @raw_body.with_indifferent_access
+    def content
+      @content ||= raw_body[response_key]
+    end
+
+    def response_key
+      @response_key ||= raw_body.keys.first
     end
 
     def status
       @raw_status
     end
+
+    def success?
+      !content.has_key?("cserrorcode")
+    end
   end
 end

data/lib/ocs/version.rb

@@ -1,3 +1,3 @@
 module Ocs
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - nownabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -125,6 +125,7 @@ files:
 - bin/console
 - bin/setup
 - lib/ocs.rb
+- lib/ocs/api_error.rb
 - lib/ocs/client.rb
 - lib/ocs/request.rb
 - lib/ocs/resources.rb
@@ -138,8 +139,10 @@ files:
 - lib/ocs/resources/group.rb
 - lib/ocs/resources/host.rb
 - lib/ocs/resources/iso.rb
+- lib/ocs/resources/network.rb
 - lib/ocs/resources/nic.rb
 - lib/ocs/resources/os_type.rb
+- lib/ocs/resources/resource_detail.rb
 - lib/ocs/resources/security_group.rb
 - lib/ocs/resources/service_offering.rb
 - lib/ocs/resources/ssh_key_pair.rb