deltacloud-core 1.1.1 → 1.1.2

data/lib/deltacloud/models/load_balancer.rb

@@ -14,45 +14,46 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+module Deltacloud
+  class LoadBalancer < BaseModel
 
-class LoadBalancer < BaseModel
+    attr_accessor :realms
+    attr_accessor :listeners
+    attr_accessor :instances
+    attr_accessor :public_addresses
+    attr_accessor :created_at
 
-  attr_accessor :realms
-  attr_accessor :listeners
-  attr_accessor :instances
-  attr_accessor :public_addresses
-  attr_accessor :created_at
-
-  def add_listener(opts)
-    @listeners << Listener.new(opts)
-  end
-
-  def to_hash(context)
-    {
-      :id => self.id,
-      :href => context.load_balancer_url(self.id),
-      :realms => realms,
-      :listeners => listeners.map { |l| l.to_hash(context) },
-      :instances => instances.map { |i| i.to_hash(context) },
-      :public_addresses => public_addresses,
-      :created_at => created_at
-    }
-  end
-
-  class Listener < BaseModel
-    attr_accessor :protocol
-    attr_accessor :load_balancer_port
-    attr_accessor :instance_port
+    def add_listener(opts)
+      @listeners << Listener.new(opts)
+    end
 
     def to_hash(context)
       {
         :id => self.id,
-        :protocol => protocol,
-        :load_balancer_port => load_balancer_port,
-        :instance_port => instance_port
+        :href => context.load_balancer_url(self.id),
+        :realms => realms,
+        :listeners => listeners.map { |l| l.to_hash(context) },
+        :instances => instances.map { |i| i.to_hash(context) },
+        :public_addresses => public_addresses,
+        :created_at => created_at
       }
     end
+
+    class Listener < BaseModel
+      attr_accessor :protocol
+      attr_accessor :load_balancer_port
+      attr_accessor :instance_port
+
+      def to_hash(context)
+        {
+          :id => self.id,
+          :protocol => protocol,
+          :load_balancer_port => load_balancer_port,
+          :instance_port => instance_port
+        }
+      end
+    end
+
   end
 
 end
-

data/lib/deltacloud/models/metric.rb

@@ -13,44 +13,91 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-class Metric < BaseModel
+module Deltacloud
+  class Metric < BaseModel
 
-  attr_accessor :entity
-  attr_accessor :properties
+    attr_accessor :entity
+    attr_accessor :properties
 
-  def unknown?
-    self.entity == :unknown
-  end
-
-  def add_property(name, values=nil)
-    self.properties ||= []
-    return self if self.properties.any? { |p| p.name == name }
-    self.properties << Property.new(name, values)
-    self
-  end
-
-  def to_hash(context)
-    {
-      :id => self.id,
-      :href => context.matric_url(self.id),
-      :entity => entity,
-      :properties => properties.map { |p| p.to_hash(context) }
-    }
-  end
+    MOCK_METRICS_NAMES = [
+      'cpuUtilization',
+      'diskReadRequestCount',
+      'diskReadSector',
+      'diskWriteRequestCount',
+      'diskWriteSector',
+      'nicInputByte',
+      'nicInputPacket',
+      'nicOutputByte',
+      'nicOutputPacket'
+    ]
 
-  class Property
-    attr_accessor :name, :values
+    def unknown?
+      self.entity == :unknown
+    end
 
-    def initialize(name, values=nil)
-      @name, @values = name, values
+    def add_property(name, values=nil)
+      self.properties ||= []
+      return self if self.properties.any? { |p| p.name == name }
+      self.properties << Property.new(name, values)
+      self
     end
 
     def to_hash(context)
       {
-        :name => name,
-        :values => values
+        :id => self.id,
+        :href => context.metric_url(self.id),
+        :entity => entity,
+        :properties => properties.map { |p| p.to_hash(context) }
       }
     end
-  end
 
+    class Property
+      attr_accessor :name, :values
+
+      def initialize(name, values=nil)
+        @name, @values = name, values
+      end
+
+      def to_hash(context)
+        {
+          :name => name,
+          :values => values
+        }
+      end
+
+      def generate_mock_values!
+        generator = lambda { |name, kind|
+          v = {
+            :min => (1+(rand(49))),
+            :max => (50+(rand(50)))
+          }
+          (name == 'cpuUtilization') ? v[kind].to_f/100 : v[kind]
+        }
+        @values = (0..5).map do |v_id|
+          {
+            :minimum => min = generator.call(@name, :min),
+            :maximum => max = generator.call(@name, :max),
+            :average => (min+max)/2,
+            :timestamp => (Time.now-v_id).to_i,
+            :unit => unit_for(@name)
+          }
+        end
+      end
+
+      private
+
+      def unit_for(name)
+        case name
+        when /Utilization/ then 'Percent'
+        when /Byte/ then 'Bytes'
+        when /Sector/ then 'Count'
+        when /Count/ then 'Count'
+        when /Packet/ then 'Count'
+        else 'None'
+        end
+      end
+
+    end
+
+  end
 end

data/lib/deltacloud/models/provider.rb

@@ -16,20 +16,22 @@
 # Model to store the hardware profile applied to an instance together with
 # any instance-specific overrides
 
-class Provider < BaseModel
-  attr_accessor :url
-  attr_accessor :name
+module Deltacloud
+  class Provider < BaseModel
+    attr_accessor :url
+    attr_accessor :name
 
-  def initialize(opts={})
-    super(opts)
-  end
+    def initialize(opts={})
+      super(opts)
+    end
 
-  def to_hash(context)
-    {
-      :id => self.id,
-      :name => name,
-      :url => url
-    }
-  end
+    def to_hash(context)
+      {
+        :id => self.id,
+        :name => name,
+        :url => url
+      }
+    end
 
+  end
 end

data/lib/deltacloud/models/realm.rb

@@ -14,29 +14,23 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+module Deltacloud
+  class Realm < BaseModel
 
-class Realm < BaseModel
+    attr_accessor :name
+    attr_accessor :limit
+    attr_accessor :state
 
-  attr_accessor :name
-  attr_accessor :limit
-  attr_accessor :state
-  attr_accessor :resource_types
+    def to_hash(context)
+      r = {
+        :id => self.id,
+        :href => context.realm_url(self.id),
+        :name => name,
+        :state => state,
+        :limit => limit
+      }
+      r
+    end
 
-  def initialize(init=nil)
-    super(init)
-    self.resource_types ||= []
   end
-
-  def to_hash(context)
-    r = {
-      :id => self.id,
-      :href => context.realm_url(self.id),
-      :name => name,
-      :state => state,
-      :limit => limit
-    }
-    r.merge!({:resource_types => resource_types}) if resource_types
-    r
-  end
-
 end

data/lib/deltacloud/models/storage_snapshot.rb

@@ -14,28 +14,32 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+module Deltacloud
+  class StorageSnapshot < BaseModel
 
+    attr_accessor :state
+    attr_accessor :storage_volume_id
+    attr_accessor :created
+    attr_accessor :name
+    attr_accessor :description
 
-class StorageSnapshot < BaseModel
+    def is_completed?
+      state == 'completed'
+    end
 
-  attr_accessor :state
-  attr_accessor :storage_volume_id
-  attr_accessor :created
-  attr_accessor :name
-  attr_accessor :description
+    def to_hash(context)
+      {
+        :id => self.id,
+        :href => context.storage_snapshot_url(self.id),
+        :state => state,
+        :storage_volume => {
+          :id => storage_volume_id,
+          :href => context.storage_volume_url(storage_volume_id),
+          :rel => :storage_volume 
+        },
+        :created => created
+      }
+    end
 
-  def is_completed?
-    state == 'completed'
   end
-
-  def to_hash(context)
-    {
-      :id => self.id,
-      :href => context.storage_snapshot_url(self.id),
-      :state => state,
-      :storage_volume => { :id => storage_volume_id, :href => context.storage_volume_url(storage_volume_id), :rel => :storage_volume },
-      :created => created
-    }
-  end
-
 end

data/lib/deltacloud/models/storage_volume.rb

@@ -14,42 +14,43 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+module Deltacloud
+  class StorageVolume < BaseModel
 
-class StorageVolume < BaseModel
+    attr_accessor :created
+    attr_accessor :state
+    attr_accessor :capacity
+    attr_accessor :instance_id
+    attr_accessor :device
+    attr_accessor :realm_id
+    attr_accessor :actions
+    attr_accessor :name
+    attr_accessor :kind
+    attr_accessor :description # openstack volumes have a display_description attr
 
-  attr_accessor :created
-  attr_accessor :state
-  attr_accessor :capacity
-  attr_accessor :instance_id
-  attr_accessor :device
-  attr_accessor :realm_id
-  attr_accessor :actions
-  attr_accessor :name
-  attr_accessor :kind
-  attr_accessor :description # openstack volumes have a display_description attr
-
-  def to_hash(context)
-    r = {
-      :id => self.id,
-      :href => context.storage_volume_url(self.id),
-      :name => name,
-      :description => description,
-      :state => state,
-      :created => created,
-      :realm => { :id => realm_id, :href => context.realm_url(realm_id), :rel => :realm },
-      :device => device,
-      :kind => kind,
-      :capacity => capacity,
-    }
-    r[:actions] = (actions || []).map { |a|
-      { :href => context.send("#{a}_storage_volume_url", self.id), :rel => a }
-    }
-    if instance_id
-      r[:instance] = { :id => instance_id, :href => context.instance_url(instance_id), :rel => :instance }
-    else
-      r[:instance] = {}
+    def to_hash(context)
+      r = {
+        :id => self.id,
+        :href => context.storage_volume_url(self.id),
+        :name => name,
+        :description => description,
+        :state => state,
+        :created => created,
+        :realm => { :id => realm_id, :href => context.realm_url(realm_id), :rel => :realm },
+        :device => device,
+        :kind => kind,
+        :capacity => capacity,
+      }
+      r[:actions] = (actions || []).map { |a|
+        { :href => context.send("#{a}_storage_volume_url", self.id), :rel => a }
+      }
+      if instance_id
+        r[:instance] = { :id => instance_id, :href => context.instance_url(instance_id), :rel => :instance }
+      else
+        r[:instance] = {}
+      end
+      r
     end
-    r
-  end
 
+  end
 end

data/lib/deltacloud/version.rb

@@ -15,6 +15,6 @@
 # under the License.
 
 module Deltacloud
-  API_VERSION = '1.1.1'
+  API_VERSION = '1.1.2'
   CIMI_API_VERSION = '1.0.1'
 end

data/lib/deltacloud_rack.rb

@@ -57,6 +57,28 @@ module Deltacloud
     @default_frontend || config[:deltacloud]
   end
 
+  def self.generate_routes
+    frontends.inject({}) do |result, frontend|
+      frontend = frontend.strip
+      if Deltacloud[frontend.to_sym].nil?
+        puts "ERROR: Unknown frontend (#{frontend}). Valid values are 'deltacloud,cimi,ec2'"
+        exit(1)
+      end
+      Deltacloud[frontend.to_sym].require!
+      result[Deltacloud[frontend].root_url] = Deltacloud[frontend].klass
+      result
+    end
+  end
+
+  def self.frontends
+    ENV['API_FRONTEND'] ||= 'deltacloud'
+    ENV['API_FRONTEND'].split(',')
+  end
+
+  def self.need_database?
+    frontends.include?('cimi') || ENV['RACK_ENV'] == 'test'
+  end
+
   require 'sinatra/base'
   require_relative './deltacloud/helpers/deltacloud_helper'
   require_relative './sinatra/rack_accept'