wakame-vdc-agents 10.12.0 → 11.06.0

data/lib/dcmgr/models/instance_nic.rb

@@ -8,15 +8,25 @@ module Dcmgr::Models
     inheritable_schema do
       Fixnum :instance_id, :null=>false
       Fixnum :network_id, :null=>false
+      Fixnum :nat_network_id
+      Fixnum :bandwidth_group_id
       String :mac_addr, :null=>false, :size=>12
       
       index :mac_addr
     end
     with_timestamps
 
+    many_to_one :bandwidth_group
     many_to_one :instance
+    many_to_one :nat_network, :key => :nat_network_id, :class => Network
     many_to_one :network
-    one_to_one :ip, :class=>IpLease
+    one_to_many :ip, :class=>IpLease
+    one_to_many(:direct_ip_lease, :class=>IpLease, :read_only=>true) do |ds|
+      ds.where(:network_id=>self.network_id)
+    end
+    one_to_many(:nat_ip_lease, :class=>IpLease, :read_only=>true) do |ds|
+      ds.where(:network_id=>self.nat_network_id)
+    end
 
     def to_hash
       h = values.dup.merge(super)
@@ -43,7 +53,7 @@ module Dcmgr::Models
 
     def before_destroy
       MacLease.find(:mac_addr=>self.mac_addr).destroy
-      ip && ip.destroy
+      ip_dataset.destroy
       super
     end
 

data/lib/dcmgr/models/instance_spec.rb

@@ -5,12 +5,17 @@ module Dcmgr::Models
     taggable 'is'
 
     inheritable_schema do
+      String :name, :null=>false
       String :hypervisor, :null=>false
       String :arch, :null=>false
       
       Fixnum :cpu_cores, :null=>false, :unsigned=>true
       Fixnum :memory_size, :null=>false, :unsigned=>true
+      Float  :quota_weight, :null=>false, :default=>1.0
       Text :config, :null=>false, :default=>''
+      Text :storage, :null=>false, :default=>''
+
+      index [:account_id, :name], {:unique=>true}
     end
     with_timestamps
 
@@ -21,6 +26,10 @@ module Dcmgr::Models
     # {:block_driver=>'virtio', :nic_driver=>'virtio'}
     plugin :serialization
     serialize_attributes :yaml, :config
+    # hypervisor=kvm:
+    # { 'sdc'  => {:type=>:vdcvol, :size=>100, :dev=>'/dev/sdc'},
+    #   'eph1' => {:type=>:ephemeral, :size=>1000, :dev=>'/dev/sdb'}}
+    serialize_attributes :yaml, :storage
 
     def before_validate
       default_config =
@@ -35,7 +44,14 @@ module Dcmgr::Models
 
     def to_hash
       super.merge({:config=>self.config, # yaml -> Hash
+                    :storage => self.storage, # yaml -> Hash
                   })
     end
+
+    def to_api_document
+      doc = to_hash
+      doc.delete(:config)
+      doc
+    end
   end
 end

data/lib/dcmgr/models/ip_lease.rb

@@ -8,15 +8,22 @@ module Dcmgr::Models
     TYPE_AUTO=0
     TYPE_RESERVED=1
     TYPE_MANUAL=2
+
+    TYPE_MESSAGES={
+      TYPE_AUTO=>'auto',
+      TYPE_RESERVED=>'reserved',
+      TYPE_MANUAL=>'manual'
+    }
     
     inheritable_schema do
       Fixnum :instance_nic_id
       Fixnum :network_id, :null=>false
       String :ipv4, :size=>50
-      Fixnum :type, :null=>false, :default=>TYPE_AUTO
+      Fixnum :alloc_type, :null=>false, :default=>TYPE_AUTO
       Text :description
       
       index [:network_id, :ipv4], {:unique=>true}
+      index [:instance_nic_id, :network_id]
     end
     with_timestamps
 
@@ -36,6 +43,35 @@ module Dcmgr::Models
       end
     end
 
+    # check if the current lease is for NAT outside address lease.
+    # @return [TrueClass,FalseClass] return true if the lease is for NAT outside.
+    def is_natted?
+      instance_nic.network_id != network_id
+    end
+
+    # get the lease of NAT outside network.
+    # @return [IpLease,nil]
+    #    if the IpLease has a pair NAT address it will return
+    #    outside IpLease.
+    def nat_outside_lease
+      if self.network.nat_network_id
+        self.class.find(:instance_nic_id=>self.instance_nic.id, :network_id=>self.network.nat_network_id)
+      else
+        nil
+      end
+    end
+
+    # get the lease of NAT inside network.
+    # @return [IpLease,nil] IpLease (outside) will return inside
+    #     IpLease.
+    def nat_inside_lease
+      if self.network.nat_network_id.nil?
+        self.class.find(:instance_nic_id=>self.instance_nic.id, :network_id=>nil)
+      else
+        nil
+      end
+    end
+
     def self.lease(instance_nic, network)
       raise TypeError unless instance_nic.is_a?(InstanceNic)
       raise TypeError unless network.is_a?(Network)

data/lib/dcmgr/models/netfilter_group.rb

@@ -13,7 +13,7 @@ module Dcmgr::Models
     end
 
     one_to_many :netfilter_rules
-    one_to_many :instance_netfilter_groups
+    many_to_many :instances,:join_table => :instance_netfilter_groups
 
     def to_hash
       h = super
@@ -28,6 +28,10 @@ module Dcmgr::Models
       #:rules => netfilter_rules.map { |rule| rule.to_hash },
       #}
     end
+    
+    def to_api_document
+      to_hash
+    end
 
     def to_tiny_hash
       {
@@ -50,6 +54,8 @@ module Dcmgr::Models
     end
 
     def before_destroy
+      return false if self.instances.size > 0
+
       self.flush_rule
       super
     end
@@ -79,11 +85,5 @@ module Dcmgr::Models
       }
     end
 
-    def instances
-      self.instance_netfilter_groups.map { |instance_netfilter_group|
-        instance_netfilter_group.instance
-      }
-    end
-
   end
 end

data/lib/dcmgr/models/network.rb

@@ -14,13 +14,28 @@ module Dcmgr::Models
       String :dns_server
       String :dhcp_server
       String :metadata_server
-      Fixnum :vlan_lease_id, :null=>false
+      Fixnum :metadata_server_port
+      Fixnum :bandwidth #in Mbit/s
+      Fixnum :vlan_lease_id, :null=>false, :default=>0
+      Fixnum :nat_network_id
       Text :description
+      index :nat_network_id
     end
     with_timestamps
 
-    one_to_many :ip_lease
+    module IpLeaseMethods
+      def add_reserved(ipaddr, description=nil)
+        model.create(:network_id=>model_object.id,
+                     :ipv4=>ipaddr,
+                     :alloc_type=>IpLease::TYPE_RESERVED,
+                     :description=>description)
+      end
+    end
+    one_to_many :ip_lease, :extend=>IpLeaseMethods
     many_to_one :vlan_lease
+    
+    many_to_one :nat_network, :key => :nat_network_id, :class => self
+    one_to_many :inside_networks, :key => :nat_network_id, :class => self
 
     def validate
       super
@@ -41,11 +56,35 @@ module Dcmgr::Models
       h = super
       h.delete(:vlan_lease_id)
       h.merge({
+                :bandwidth_mark=>self[:id],
                 :description=>description.to_s,
-                :vlan_id => vlan_lease.tag_id,
+                :vlan_id => vlan_lease.nil? ? 0 : vlan_lease.tag_id,
               })
     end
 
+    def before_destroy
+      #Make sure no other networks are natted to this one
+      Network.filter(:nat_network_id => self[:id]).each { |n|
+        n.nat_network_id = nil
+        n.save
+      }
+      
+      #Delete all reserved ipleases in this network
+      self.ip_lease_dataset.filter(:alloc_type => IpLease::TYPE_RESERVED).each { |i|
+        i.destroy
+      }
+      
+      super
+    end
+
+    def to_api_document
+      to_hash
+    end
+
+    def nat_network
+      Network.find(:id => self.nat_network_id)
+    end
+
     def ipaddress
       IPAddress::IPv4.new("#{self.ipv4_gw}/#{self.prefix}")
     end

data/lib/dcmgr/models/quota.rb

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+module Dcmgr::Models
+  # Per account quota limit for the VDC resources.
+  class Quota < BaseNew
+    taggable 'q'
+    
+    inheritable_schema do
+      Fixnum :account_id, :null=>false
+      Float  :instance_total_weight
+      Fixnum :volume_total_size
+
+      index :account_id
+    end
+    with_timestamps
+
+    def before_validation
+      # sets default quota values from dcmgr.conf.
+      self.instance_total_weight ||= Dcmgr.conf.account_instance_total_weight
+      self.volume_total_size ||= Dcmgr.conf.account_volume_total_size
+      super
+    end
+  end
+end
+

data/lib/dcmgr/models/request_log.rb

@@ -5,21 +5,36 @@ module Dcmgr::Models
 
     inheritable_schema do
       String :request_id, :null=>false, :size=>40, :unique=>true
-      Fixnum :frontend_system_id, :null=>false
-      Fixnum :account_id, :null=>false
-      String :requester_symbol, :null=>false, :size=>100
-      # HTTP Response Code
-      Fixnum :response_status, :null=>false
-      String :response_msg
+      String :frontend_system_id, :null=>false, :size=>40
+      String :account_id, :null=>false, :size=>40
+      String :requester_token, :null=>true, :size=>100
+      # HTTP Request Content
+      String :request_method, :null=>false, :size=>10
       String :api_path, :null=>false
-      String :params, :null=>false
-      Time :requested_at
-      Time :responsed_at
+      Text   :params, :null=>false
+      # HTTP Response Content
+      Fixnum :response_status, :null=>false
+      Text   :response_msg, :null=>true
+      Time :requested_at, :null=>false
+      Fixnum :requested_at_usec, :null=>false, :unsigned=>true
+      Time :responded_at, :null=>false
+      Fixnum :responded_at_usec, :null=>false, :unsigned=>true
     end
 
     def after_initialize
-      self[:request_id] #
+      super
+      self[:request_id] ||= Isono::Util.gen_id
+      t = Time.now
+      self[:requested_at] = t
+      self[:requested_at_usec] = t.usec
     end
-    
+
+    def before_create
+      super
+      t = Time.now
+      self[:responded_at] = t
+      self[:responded_at_usec] = t.usec
+    end
+
   end
 end

data/lib/dcmgr/models/ssh_key_pair.rb

@@ -9,6 +9,7 @@ module Dcmgr::Models
 
     inheritable_schema do
       String :name, :size=>100, :null=>false
+      String :finger_print, :size=>100, :null=>false
       Text :public_key, :null=>false
       Text :private_key, :null=>true
       
@@ -35,9 +36,17 @@ module Dcmgr::Models
         unless $?.exitstatus == 0
           raise "Failed to run ssh-keygen: exitcode=#{$?.exitstatus}"
         end
+
+        # get finger print of pkey file
+        fp = `ssh-keygen -l -f #{pkey}`
+        unless $?.exitstatus == 0
+          raise "Failed to collect finger print value"
+        end
+        fp = fp.split(/\s+/)[1]
         
         {:private_key=>IO.read(pkey),
-          :public_key=>IO.read(pubkey)}
+          :public_key=>IO.read(pubkey),
+          :finger_print => fp}
       rescue
         # clean up tmp key files
         [pkey, pubkey].each { |i|
@@ -46,6 +55,10 @@ module Dcmgr::Models
       end
     end
 
+    def to_api_document
+      to_hash
+    end
+
     private
     def self.randstr
       Array.new(10) {  (('a'..'z').to_a + (0..9).to_a)[rand(36)] }.join

data/lib/dcmgr/models/storage_pool.rb

@@ -1,30 +1,13 @@
 # -*- coding: utf-8 -*-
-require 'statemachine'
 
 module Dcmgr::Models
   class StoragePool < AccountResource
     taggable 'sp'
-    with_timestamps
-
-    STATAS_TYPE_REGISTERING = "registering"
-    STATAS_TYPE_ONLINE = "online"
-    STATAS_TYPE_DEGRADE = "degrade"
-    STATAS_TYPE_FAILED = "failed"
-    STATAS_TYPE_DEREGISTERED = "deregistered"
 
-    STATUS_MSGS = {
-      STATAS_TYPE_REGISTERING => :registering,
-      STATAS_TYPE_ONLINE => :online,
-      STATAS_TYPE_DEGRADE => :degrade,
-      STATAS_TYPE_FAILED => :failed,
-      STATAS_TYPE_DEREGISTERED => :deregistered
-    }
-    
     inheritable_schema do
       String :node_id, :null=>false
       String :export_path, :null=>false
-      String :status, :null=>false, :default=>STATAS_TYPE_REGISTERING
-      Fixnum :offerring_disk_space, :null=>false, :unsigned=>true
+      Fixnum :offering_disk_space, :null=>false, :unsigned=>true
       String :transport_type, :null=>false
       String :storage_type, :null=>false
       String :ipaddr, :null=>false
@@ -32,11 +15,12 @@ module Dcmgr::Models
 
       index :node_id
     end
+    with_timestamps
 
     one_to_many :volumes
     one_to_many :volume_snapshots
     
-    many_to_one :storage_agents
+    many_to_one :node, :class=>Isono::Models::NodeState, :key=>:node_id, :primary_key=>:node_id
     
     def before_validation
       export_path = self.export_path
@@ -47,62 +31,10 @@ module Dcmgr::Models
       end
     end
 
-    def state_machine
-      model = self
-      st = Statemachine.build do
-        superstate :storage_condition do
-          trans :registering, :on_success, :online
-          trans :registering, :on_error, :degrade
-          trans :online, :on_success, :online
-          trans :online, :on_error, :degrade
-          trans :degrade, :on_success, :online
-          trans :degrade, :on_error, :degrade
-
-          event :on_fail, :failed
-          event :on_deregistered, :deregistered
-        end
-
-        trans :failed, :on_success, :online
-        trans :failed, :on_error, :degrade
-        trans :failed, :on_deregistered, :deregistered
-
-        on_entry_of :registering, proc {
-          model.status = STATAS_TYPE_REGISTERING
-        }
-
-        on_entry_of :online, proc {
-          model.status = STATAS_TYPE_ONLINE
-        }
-
-        on_entry_of :degrade, proc {
-          model.status = STATAS_TYPE_DEGRADE
-        }
-
-        on_entry_of :failed, proc {
-          model.status = STATAS_TYPE_FAILED
-        }
-
-        on_entry_of :deregistered, proc {
-          model.status = STATAS_TYPE_DEREGISTERED
-        }
-      end
-
-      if self[:status]
-        if st.has_state(STATUS_MSGS[self[:status]].to_sym)
-          st.state = STATUS_MSGS[self[:status]].to_sym
-        else
-          raise "Unknown state: #{self[:status]}"
-        end
-      else
-        st.reset
-      end
-      st
-    end
-
     def self.create_pool(params)
       self.create(:account_id => params[:account_id],
                   :node_id => params[:node_id],
-                  :offerring_disk_space => params[:offerring_disk_space],
+                  :offering_disk_space => params[:offering_disk_space],
                   :transport_type => params[:transport_type],
                   :storage_type => params[:storage_type],
                   :export_path => params[:export_path],
@@ -126,5 +58,20 @@ module Dcmgr::Models
                         :snapshot_id => snapshot_id,
                         :size =>size)
     end
+
+    # Show status of the agent.
+    def status
+      node.nil? ? :offline : node.state
+    end
+
+    def to_hash
+      super.merge({:status=>self.status})
+    end
+
+    def to_api_document
+      h = to_hash
+      h.delete(:node_id)
+      h
+    end
   end
 end