fog-softlayer 0.2.1 → 0.3.1

data/lib/fog/softlayer/models/compute/servers.rb

@@ -4,6 +4,7 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
+
 require 'fog/core/collection'
 require 'fog/softlayer/models/compute/server'
 
@@ -22,14 +23,17 @@ module Fog
 
         ## Get a SoftLayer server.
         #
-        def get(id)
-          return nil if id.nil? || id == ""
-          response = service.get_vm(id)
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          response = service.get_vm(identifier)
+          bare_metal = false
           if response.status == 404 # we didn't find it as a VM, look for a BMC server
-            response = service.get_bare_metal_server(id)
-            response.body['bare_metal'] = true
+            response = service.get_bare_metal_server(identifier)
+            bare_metal = true
           end
           data = response.body
+          data['bare_metal'] = bare_metal
           new.merge_attributes(data)
         rescue Excon::Errors::NotFound
           nil

data/lib/fog/softlayer/models/compute/tag.rb

@@ -4,6 +4,7 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
+
 require 'fog/core/model'
 
 module Fog
@@ -29,12 +30,10 @@ module Fog
         end
 
         def references
-          service.get_tag(self.id).body['references'].map do |ref|
-            @refs ||= case ref['tagType']['keyName']
-              when 'GUEST', 'HARDWARE'
-                @servers ||= service.servers.get(ref['resourceTableId'])
-            end
-          end
+          @servers ||= service.request(:tag, "#{id}", :query => "objectMask=references;references.tagType").body['references'].map do |ref|
+            type = ref['tagType']['keyName']
+            service.servers.get(ref['resourceTableId']) if type == 'GUEST' || type == 'HARDWARE'
+          end.compact
         end
 
         def save

data/lib/fog/softlayer/models/compute/tags.rb

@@ -4,6 +4,7 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
+
 require 'fog/core/collection'
 require 'fog/softlayer/models/compute/tag'
 

data/lib/fog/softlayer/models/network/datacenter.rb

@@ -0,0 +1,52 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class Softlayer
+      class Datacenter < Fog::Model
+        identity :id
+
+        attribute :long_name,   :aliases => 'longName'
+        attribute :name
+
+        def initialize(attributes)
+          @connection = attributes[:connection]
+          super
+        end
+
+        def routers
+          requires :id
+          @routers ||= service.get_datacenter_routers(id).body
+        end
+
+        def routable_subnets
+          requires :id
+          @routable_subnets ||= service.request(:location_datacenter, "#{id}/get_bound_subnets").body
+        end
+
+        def save
+          raise "Not possible."
+        end
+
+        def create
+          raise "Not possible."
+        end
+
+        def update
+          raise "Not possible."
+        end
+
+        def destroy
+          raise "Not possible."
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/models/network/datacenters.rb

@@ -0,0 +1,42 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/collection'
+require 'fog/softlayer/models/network/datacenter'
+
+module Fog
+  module Network
+    class Softlayer
+      class Datacenters < Fog::Collection
+        attribute :filters
+
+        model Fog::Network::Softlayer::Datacenter
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters = filters)
+          self.filters = filters
+          load(service.get_datacenters.body)
+        end
+
+        def get(id)
+          data = service.request(:location_datacenter, "#{id}/get_object").body
+            new.merge_attributes(data)
+        rescue Fog::Network::Softlayer::NotFound
+          nil
+        end
+
+        def by_name(name)
+          all.map { |dc| dc if dc.name == name }.compact.first
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/models/network/ip.rb

@@ -0,0 +1,67 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class Softlayer
+      class Ip < Fog::Model
+        identity :id
+
+        attribute :subnet_id,             :aliases => 'subnetId'
+        attribute :address,               :aliases => 'ipAddress'
+        attribute :broadcast,            :aliases => 'isBroadcast'
+        attribute :gateway,              :aliases => 'isGateway'
+        attribute :network,              :aliases => 'isNetwork'
+        attribute :reserved,             :aliases => 'isReserved'
+        attribute :note
+        attribute :assigned_to,           :aliases => ['hardware', 'virtualGuest']
+
+        def initialize(attributes)
+          @connection = attributes[:connection]
+          super
+        end
+
+        def save
+          requires :subnet_id
+          identity ? update : create
+        end
+
+        def create
+
+        end
+
+        def update
+          self
+        end
+
+        def destroy
+          requires :id
+          true
+        end
+
+        def broadcast?
+          attribute[:broadcast]
+        end
+
+        def gateway?
+          attribute[:gateway]
+        end
+
+        def network?
+          attribute[:network]
+        end
+
+        def reserved?
+          attribute[:reserved]
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/softlayer/models/network/ips.rb

@@ -0,0 +1,39 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/collection'
+require 'fog/softlayer/models/network/ip'
+
+module Fog
+  module Network
+    class Softlayer
+      class Ips < Fog::Collection
+        attribute :filters
+
+        model Fog::Network::Softlayer::Ip
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters = filters)
+          self.filters = filters
+          load(service.list_ips(filters).body)
+        end
+
+        def get(id)
+          if ip = service.get_ip_address(id).body
+            new(ip)
+          end
+        rescue Fog::Network::Softlayer::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/softlayer/models/network/network.rb

@@ -0,0 +1,121 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class Softlayer
+      class Network < Fog::Model
+        identity :id
+
+        attribute :name
+        attribute :modify_date,               :aliases => 'modifyDate'
+        attribute :note
+        attribute :tags,                      :aliases => 'tagReferences'
+        attribute :type,                      :squash => :keyName
+        attribute :datacenter
+        attribute :network_space,             :aliases => 'networkSpace'
+        attribute :router,                    :aliases => 'primaryRouter'
+        #attribute :subnets
+
+        def add_tags(tags)
+          requires :id
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          tags.each do |tag|
+            service.tags.new(:resource_id => self.id, :name => tag).save
+          end
+          self.reload
+          true
+        end
+
+        def datacenter
+          @datacenter ||= attributes[:datacenter] or (service.datacenters.new(attributes[:router]['datacenter']) if attributes[:router] and attributes[:router]['datacenter'])
+        end
+
+        def delete_tags(tags)
+          requires :id
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          tags.each do |tag|
+            service.tags.new(:resource_id => self.id, :name => tag).destroy
+          end
+          self.reload
+          true
+        end
+
+        def router=(new_data)
+          raise ArgumentError, "Network Router must be a Hash." unless new_data.is_a?(Hash)
+          attributes[:router] = new_data.select { |k,v| ['id', 'hostname', 'datacenter'].include?(k) }
+        end
+
+        def private?
+          requires :network_space
+          network_space == 'PRIVATE'
+        end
+
+        def public?
+          requires :network_space
+          network_space == 'PUBLIC'
+        end
+
+        def save
+          identity ? update : create
+        end
+
+        def subnets
+          requires :id
+          @subnets ||= attributes['subnets'].map do |subnet|
+            service.subnets.get(subnet['id'])
+          end
+        end
+
+        def create
+          requires :datacenter, :router, :network_space
+          response = service.create_network(build_order).body
+          merge_attributes(response)
+          self
+        end
+
+        def update
+          requires :id
+          merge_attributes(service.update_network(self.id, self.attributes).body)
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_network(self.id)
+          true
+        end
+
+        def tags
+          requires :id
+          attributes[:tags].map { |i| i['tag']['name'] } if attributes[:tags]
+        end
+
+        private
+
+        def build_order
+          {
+              'complexType' => 'SoftLayer_Container_Product_Order_Network_Vlan',
+              'name' => name,
+              'routerId' =>router['id'],
+              'router' => router['hostname'],
+              'location' => datacenter.id,
+              'quantity' =>1,
+              'packageId' =>0,
+              'prices' =>[
+                  {'id' => public? ? service.get_public_vlan_price_code : service.get_private_vlan_price_code },
+                  {'id' => service.get_subnet_price_code }
+              ]
+          }
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/softlayer/models/network/networks.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/collection'
+require 'fog/softlayer/models/network/network'
+
+module Fog
+  module Network
+    class Softlayer
+      class Networks < Fog::Collection
+        model Fog::Network::Softlayer::Network
+
+        def all
+          data = service.list_networks.body
+          load(data)
+        end
+
+        def get(id)
+          if network = service.get_network(id).body
+            new(network)
+          end
+        rescue Fog::Network::Softlayer::NotFound
+          nil
+        end
+
+        def tagged_with(tags)
+          raise ArgumentError, "Tags argument for #{self.class.name}##{__method__} must be Array." unless tags.is_a?(Array)
+          ids = service.get_references_by_tag_name(tags.join(',')).body.map do |tag|
+            tag['references'].map do |ref|
+              ref['resourceTableId']
+            end
+          end.flatten.uniq
+          ids.map { |id| get(id) }
+        end
+
+        def by_name(name)
+          all.select { |vlan| vlan.name == name }.first
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/softlayer/models/network/subnet.rb

@@ -0,0 +1,62 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class Softlayer
+      class Subnet < Fog::Model
+        identity :id
+
+        attribute :name,                  :aliases => 'note'
+        attribute :network_id,            :aliases => 'networkIdentifier'
+        attribute :vlan_id,               :aliases => 'networkVlanId'
+        attribute :cidr
+        attribute :ip_version,            :aliases => 'version'
+        attribute :type,                  :aliases => 'subnetType'
+        attribute :gateway_ip,            :aliases => 'gateway'
+        attribute :broadcast,             :aliases => 'broadcastAddress'
+        attribute :gateway
+        attribute :datacenter,            :squash => :name
+
+        def addresses
+          @addresses ||= attributes['ipAddresses'].map do |address|
+            service.ips.get(address['id'])
+          end
+        end
+
+        def save
+          requires :network_id, :cidr, :ip_version
+          identity ? update : create
+        end
+
+        def create
+          requires :network_id, :cidr, :ip_version
+          merge_attributes(service.create_subnet(self.network_id,
+                                                 self.cidr,
+                                                 self.ip_version,
+                                                 self.attributes).body['subnet'])
+          self
+        end
+
+        def update
+          requires :id, :network_id, :cidr, :ip_version
+          merge_attributes(service.update_subnet(self.id,
+                                                 self.attributes).body['subnet'])
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_subnet(self.id)
+          true
+        end
+      end
+    end
+  end
+end