ey-core 3.4.4 → 3.4.5

data/lib/ey-core/models/server.rb

@@ -1,151 +1,151 @@
-class Ey::Core::Client::Server < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id, type: :integer
-
-  attribute :created_at,       type: :time
-  attribute :dedicated,        type: :boolean
-  attribute :deleted_at,       type: :time
-  attribute :deprovisioned_at, type: :time
-  attribute :devices,          type: :array
-  attribute :disappeared_at,   type: :time
-  attribute :enabled,          type: :boolean
-  attribute :flavor_id,        squash: ["flavor", "id"]
-  attribute :keymaster_id
-  attribute :location
-  attribute :name
-  attribute :private_hostname
-  attribute :provisioned_at,   type: :time
-  attribute :provisioned_id
-  attribute :public_hostname
-  attribute :public_key
-  attribute :role
-  attribute :ssh_port,         type: :integer
-  attribute :state
-  attribute :token
-  attribute :updated_at,       type: :time
-  attribute :wait_for_chef,    type: :boolean
-  attribute :release_label
-  attribute :ip_id
-
-  has_one :account
-  has_one :address, collection: "addresses"
-  has_one :environment
-  has_one :provider
-
-  has_many :alerts
-  has_many :volumes
-  has_many :events, key: :server_events
-  has_many :firewalls
-  has_many :logs
-
-  attr_accessor :mnt_volume_size, :volume_size, :iops, :snapshot_id, :force
-
-  def apply(type="main")
-    requires :identity
-
-    connection.requests.new(self.connection.apply_server_updates("id" => self.identity, "type" => type).body["request"])
-  end
-
-  def latest_main_log
-    logs.select{|l| l.filename.match(/main/)}.sort_by(&:created_at).last
-  end
-
-  def latest_custom_log
-    logs.select{|l| l.filename.match(/custom/)}.sort_by(&:created_at).last
-  end
-
-  def reboot
-    requires :identity
-
-    connection.requests.new(
-      self.connection.reboot_server("id" => self.identity).body["request"]
-    )
-  end
-
-  def stop
-    requires :identity
-
-    connection.requests.new(
-      self.connection.stop_server("id" => self.identity).body["request"]
-    )
-  end
-
-  def start
-    requires :identity
-
-    connection.requests.new(
-      self.connection.start_server("id" => self.identity).body["request"]
-    )
-  end
-
-  def reconcile
-    requires :identity
-
-    connection.requests.new(
-      self.connection.reconcile_server("id" => self.identity).body["request"]
-    )
-  end
-
-  def reset_state(state)
-    params = {
-      "url"   => self.collection.url,
-      "id"    => self.id,
-      "state" => state
-    }
-
-    unless new_record?
-      merge_attributes(self.connection.reset_server_state(params).body["server"])
-    end
-  end
-
-  def save!
-    if new_record?
-      requires :flavor_id, :role, :environment
-
-      server_attributes = {
-        "environment" => environment.id,
-        "wait_for_chef" => self.wait_for_chef,
-        "snapshot"    => self.snapshot_id,
-        "force"       => self.force,
-        "server"      => {
-          "dedicated"       => self.dedicated,
-          "flavor"          => self.flavor_id,
-          "iops"            => self.iops,
-          "location"        => self.location || environment.region,
-          "mnt_volume_size" => self.mnt_volume_size,
-          "name"            => self.name,
-          "release_label"   => self.release_label,
-          "role"            => self.role,
-          "volume_size"     => self.volume_size,
-          "ip_id"           => self.ip_id
-        }
-      }
-      connection.requests.new(connection.create_server(server_attributes).body["request"])
-    else
-      requires :identity
-      server_attributes = Cistern::Hash.slice(Cistern::Hash.stringify_keys(self.attributes), "provisioned_at", "deprovisioned_at", "disappeared_at")
-      server_attributes.merge!("status" => self.state) if self.state
-      connection.update_server(
-        "id"     => self.identity,
-        "server" => server_attributes,
-      )
-    end
-  end
-
-  def destroy!(skip_snapshot="false")
-    if environment.servers.count == 1
-      raise Ey::Core::Client::NotPermitted, "Terminating the last server in an environment is not allowed.  You must deprovision or destroy the environment instead."
-    end
-
-    requires :identity
-
-    params = {
-       :skip_snapshot => skip_snapshot
-    }
-
-    connection.requests.new(
-      self.connection.destroy_server(self.identity, params).body["request"]
-    )
-  end
-end
+class Ey::Core::Client::Server < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id, type: :integer
+
+  attribute :created_at,       type: :time
+  attribute :dedicated,        type: :boolean
+  attribute :deleted_at,       type: :time
+  attribute :deprovisioned_at, type: :time
+  attribute :devices,          type: :array
+  attribute :disappeared_at,   type: :time
+  attribute :enabled,          type: :boolean
+  attribute :flavor_id,        squash: ["flavor", "id"]
+  attribute :keymaster_id
+  attribute :location
+  attribute :name
+  attribute :private_hostname
+  attribute :provisioned_at,   type: :time
+  attribute :provisioned_id
+  attribute :public_hostname
+  attribute :public_key
+  attribute :role
+  attribute :ssh_port,         type: :integer
+  attribute :state
+  attribute :token
+  attribute :updated_at,       type: :time
+  attribute :wait_for_chef,    type: :boolean
+  attribute :release_label
+  attribute :ip_id
+
+  has_one :account
+  has_one :address, collection: "addresses"
+  has_one :environment
+  has_one :provider
+
+  has_many :alerts
+  has_many :volumes
+  has_many :events, key: :server_events
+  has_many :firewalls
+  has_many :logs
+
+  attr_accessor :mnt_volume_size, :volume_size, :iops, :snapshot_id, :force
+
+  def apply(type="main")
+    requires :identity
+
+    connection.requests.new(self.connection.apply_server_updates("id" => self.identity, "type" => type).body["request"])
+  end
+
+  def latest_main_log
+    logs.select{|l| l.filename.match(/main/)}.sort_by(&:created_at).last
+  end
+
+  def latest_custom_log
+    logs.select{|l| l.filename.match(/custom/)}.sort_by(&:created_at).last
+  end
+
+  def reboot
+    requires :identity
+
+    connection.requests.new(
+      self.connection.reboot_server("id" => self.identity).body["request"]
+    )
+  end
+
+  def stop
+    requires :identity
+
+    connection.requests.new(
+      self.connection.stop_server("id" => self.identity).body["request"]
+    )
+  end
+
+  def start
+    requires :identity
+
+    connection.requests.new(
+      self.connection.start_server("id" => self.identity).body["request"]
+    )
+  end
+
+  def reconcile
+    requires :identity
+
+    connection.requests.new(
+      self.connection.reconcile_server("id" => self.identity).body["request"]
+    )
+  end
+
+  def reset_state(state)
+    params = {
+      "url"   => self.collection.url,
+      "id"    => self.id,
+      "state" => state
+    }
+
+    unless new_record?
+      merge_attributes(self.connection.reset_server_state(params).body["server"])
+    end
+  end
+
+  def save!
+    if new_record?
+      requires :flavor_id, :role, :environment
+
+      server_attributes = {
+        "environment" => environment.id,
+        "wait_for_chef" => self.wait_for_chef,
+        "snapshot"    => self.snapshot_id,
+        "force"       => self.force,
+        "server"      => {
+          "dedicated"       => self.dedicated,
+          "flavor"          => self.flavor_id,
+          "iops"            => self.iops,
+          "location"        => self.location || environment.region,
+          "mnt_volume_size" => self.mnt_volume_size,
+          "name"            => self.name,
+          "release_label"   => self.release_label,
+          "role"            => self.role,
+          "volume_size"     => self.volume_size,
+          "ip_id"           => self.ip_id
+        }
+      }
+      connection.requests.new(connection.create_server(server_attributes).body["request"])
+    else
+      requires :identity
+      server_attributes = Cistern::Hash.slice(Cistern::Hash.stringify_keys(self.attributes), "provisioned_at", "deprovisioned_at", "disappeared_at")
+      server_attributes.merge!("status" => self.state) if self.state
+      connection.update_server(
+        "id"     => self.identity,
+        "server" => server_attributes,
+      )
+    end
+  end
+
+  def destroy!(skip_snapshot="false")
+    if environment.servers.count == 1
+      raise Ey::Core::Client::NotPermitted, "Terminating the last server in an environment is not allowed.  You must deprovision or destroy the environment instead."
+    end
+
+    requires :identity
+
+    params = {
+       :skip_snapshot => skip_snapshot
+    }
+
+    connection.requests.new(
+      self.connection.destroy_server(self.identity, params).body["request"]
+    )
+  end
+end

data/lib/ey-core/models/server_event.rb

@@ -1,11 +1,11 @@
-class Ey::Core::Client::ServerEvent < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :type
-  attribute :created_at, type: :time
-  attribute :updated_at, type: :time
-
-  has_one :server
-end
+class Ey::Core::Client::ServerEvent < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :type
+  attribute :created_at, type: :time
+  attribute :updated_at, type: :time
+
+  has_one :server
+end

data/lib/ey-core/models/server_usage.rb

@@ -1,15 +1,15 @@
-class Ey::Core::Client::ServerUsage < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  attribute :start_at,    type: :time
-  attribute :end_at,      type: :time
-  attribute :report_time, type: :time
-  attribute :flavor
-  attribute :dedicated
-  attribute :location
-  attribute :deis
-  attribute :provisioned_id
-
-  has_one :environment
-  has_one :provider
-end
+class Ey::Core::Client::ServerUsage < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  attribute :start_at,    type: :time
+  attribute :end_at,      type: :time
+  attribute :report_time, type: :time
+  attribute :flavor
+  attribute :dedicated
+  attribute :location
+  attribute :deis
+  attribute :provisioned_id
+
+  has_one :environment
+  has_one :provider
+end

data/lib/ey-core/models/service.rb

@@ -1,10 +1,10 @@
-class Ey::Core::Client::Service < Cistern::Model
-
-  identity :name
-
-  attribute :now, type: :time
-  attribute :environment
-  attribute :revision
-  attribute :version
-
-end
+class Ey::Core::Client::Service < Cistern::Model
+
+  identity :name
+
+  attribute :now, type: :time
+  attribute :environment
+  attribute :revision
+  attribute :version
+
+end

data/lib/ey-core/models/ssl_certificate.rb

@@ -1,44 +1,44 @@
-class Ey::Core::Client::SslCertificate < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :created_at, type: :time
-  attribute :deleted_at, type: :time
-
-  attribute :name
-  attribute :public_certificate
-  attribute :private_key
-  attribute :certificate_chain
-  attribute :self_signed
-
-  has_one :account
-
-  attr_accessor :self_sign
-
-  def save!
-    params = {
-      "url"             => self.collection.url,
-      "account"         => self.account_id,
-      "ssl_certificate" => {
-        "name"               => self.name,
-        "public_certificate" => self.public_certificate,
-        "private_key"        => self.private_key,
-        "certificate_chain"  => self.certificate_chain,
-      }
-    }
-
-    params["ssl_certificate"].merge!("self_sign" => self.self_sign.nil? ? self.self_signed : self.self_sign) if new_record?
-
-    if new_record?
-      connection.requests.new(self.connection.create_ssl_certificate(params).body["request"])
-    else
-      params["id"] = self.id
-      self.connection.update_ssl_certificate(params).body["request"]
-    end
-  end
-
-  def destroy!
-    self.connection.destroy_ssl_certificate("id" => self.id)
-  end
-end
+class Ey::Core::Client::SslCertificate < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :created_at, type: :time
+  attribute :deleted_at, type: :time
+
+  attribute :name
+  attribute :public_certificate
+  attribute :private_key
+  attribute :certificate_chain
+  attribute :self_signed
+
+  has_one :account
+
+  attr_accessor :self_sign
+
+  def save!
+    params = {
+      "url"             => self.collection.url,
+      "account"         => self.account_id,
+      "ssl_certificate" => {
+        "name"               => self.name,
+        "public_certificate" => self.public_certificate,
+        "private_key"        => self.private_key,
+        "certificate_chain"  => self.certificate_chain,
+      }
+    }
+
+    params["ssl_certificate"].merge!("self_sign" => self.self_sign.nil? ? self.self_signed : self.self_sign) if new_record?
+
+    if new_record?
+      connection.requests.new(self.connection.create_ssl_certificate(params).body["request"])
+    else
+      params["id"] = self.id
+      self.connection.update_ssl_certificate(params).body["request"]
+    end
+  end
+
+  def destroy!
+    self.connection.destroy_ssl_certificate("id" => self.id)
+  end
+end

data/lib/ey-core/models/storage.rb

@@ -1,38 +1,38 @@
-class Ey::Core::Client::Storage < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :name
-  attribute :location
-  attribute :provisioned_id
-
-  attribute :created_at, type: :time
-  attribute :deleted_at, type: :time
-
-  has_one :provider
-
-  has_many :storage_users, aliases: "users"
-
-  def save!
-    requires :provider_id, :name, :location
-
-    params = {
-        "url" => self.collection.url,
-        "provider" => self.provider_id,
-        "storage" => {
-          "location" => self.location,
-          "name" => self.name
-        },
-    }
-
-    if new_record?
-      self.connection.requests.new(self.connection.create_storage(params).body["request"])
-    else raise NotImplementedError
-    end
-  end
-
-  def destroy!
-    connection.requests.new(connection.destroy_storage(id).body["request"])
-  end
-end
+class Ey::Core::Client::Storage < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :name
+  attribute :location
+  attribute :provisioned_id
+
+  attribute :created_at, type: :time
+  attribute :deleted_at, type: :time
+
+  has_one :provider
+
+  has_many :storage_users, aliases: "users"
+
+  def save!
+    requires :provider_id, :name, :location
+
+    params = {
+        "url" => self.collection.url,
+        "provider" => self.provider_id,
+        "storage" => {
+          "location" => self.location,
+          "name" => self.name
+        },
+    }
+
+    if new_record?
+      self.connection.requests.new(self.connection.create_storage(params).body["request"])
+    else raise NotImplementedError
+    end
+  end
+
+  def destroy!
+    connection.requests.new(connection.destroy_storage(id).body["request"])
+  end
+end

data/lib/ey-core/models/storage_user.rb

@@ -1,44 +1,44 @@
-class Ey::Core::Client::StorageUser < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :username
-  attribute :access_id
-  attribute :secret_key
-  attribute :provisioned_id
-
-  attribute :created_at, type: :time
-  attribute :deleted_at, type: :time
-
-  has_one :storage
-
-  attr_accessor :permissions
-
-  def save!
-    requires :storage_id, :username
-
-    params = {
-        "url"          => self.collection.url,
-        "storage"      => self.storage_id,
-        "storage_user" => {
-          "username"    => self.username,
-          "permissions" => self.permissions
-        },
-    }
-
-    if new_record?
-      self.connection.requests.new(self.connection.create_storage_user(params).body["request"])
-    else raise NotImplementedError
-    end
-  end
-
-  def destroy!
-    requires :identity
-
-    params = {
-      "id" => self.identity,
-    }
-    connection.requests.new(connection.destroy_storage_user(params).body["request"])
-  end
-end
+class Ey::Core::Client::StorageUser < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :username
+  attribute :access_id
+  attribute :secret_key
+  attribute :provisioned_id
+
+  attribute :created_at, type: :time
+  attribute :deleted_at, type: :time
+
+  has_one :storage
+
+  attr_accessor :permissions
+
+  def save!
+    requires :storage_id, :username
+
+    params = {
+        "url"          => self.collection.url,
+        "storage"      => self.storage_id,
+        "storage_user" => {
+          "username"    => self.username,
+          "permissions" => self.permissions
+        },
+    }
+
+    if new_record?
+      self.connection.requests.new(self.connection.create_storage_user(params).body["request"])
+    else raise NotImplementedError
+    end
+  end
+
+  def destroy!
+    requires :identity
+
+    params = {
+      "id" => self.identity,
+    }
+    connection.requests.new(connection.destroy_storage_user(params).body["request"])
+  end
+end

data/lib/ey-core/models/support_trial.rb

@@ -1,10 +1,10 @@
-class Ey::Core::Client::SupportTrial < Ey::Core::Model
-  extend Ey::Core::Associations
-
-  identity :id
-
-  attribute :started_at, type: :time
-  attribute :expires_at, type: :time
-
-  has_one :account
-end
+class Ey::Core::Client::SupportTrial < Ey::Core::Model
+  extend Ey::Core::Associations
+
+  identity :id
+
+  attribute :started_at, type: :time
+  attribute :expires_at, type: :time
+
+  has_one :account
+end