fog-softlayer 0.4.2.pre → 0.4.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTk2YjM1ZGQ2NWNhMTg3YWYxMmEyNmIzNmEzYzFhMGU5ZDFkODZhYg==
-  data.tar.gz: !binary |-
-    OTM3OTM5MDAxNWRkYWMxYzQ3Njk1OGQzMDhjZjM5ZDY3YzdlNGMyMg==
+SHA1:
+  metadata.gz: fcc50eeec7f03f36516c3d9930ffe0ca99caf593
+  data.tar.gz: 19237aaa3333da5a9712b4690bb89255784295f3
 SHA512:
-  metadata.gz: !binary |-
-    YTM0ZTA5ZWM2NTAzMzQ1OTVmMWZlMDcyOGI3N2I3ZmY3YTRlZTZkYjJkYTVm
-    MWQzOWZmZWRhZDUzOTYxNTQ5OTJlMDBjMTUxZTNlYmVlNTUwNWYwODVmMGQ2
-    MWNkNGRiYjFiODVkZDRhYmVhMDM3NGI3MTQ2ZGE0NjIwZWEyZGQ=
-  data.tar.gz: !binary |-
-    NWNmZTE0Yjc2ODA4MmI1NzI3NmNkNGIyNDVjYWIyNTJlMjk0M2RkNjRlYzNl
-    Y2NjMTM3ODBmZDgyNjhlMGU2NTQwMzM5MzYzN2Y5NDNmNzZiN2U4YWRiZmQw
-    NDIyMDhlNDA1ZDQ4NzRhMzAwZDRiMDBlMWEzZDBhNTJhYjUxYzQ=
+  metadata.gz: e670a20dea83aab7f5bc302de049ae41cffd755530c126dbbf76fb4235afc1bd4446ee48ce69249507fd49aa89eb09e8eb6e743639cf7f6d2f656b58db030e65
+  data.tar.gz: 58f36d40a0a8396f0f42797e361553a6acc1785be773008e790585069f436cb684fbaa35dbec5a6b23f7a5508e2528ecc1256020b1f8371a2421c0727e9bcf9d

data/CONTRIBUTORS.md

@@ -4,6 +4,8 @@
 * Hiroyuki Urasoko <ura.58.58@gmail.com>
 * Konstantin Krauss <konstantin@propertybase.com>
 * Manuel Franco <mfranco@flexiant.com>
+* Matheus Mina <mfbmina@gmail.com>
 * Matt Eldridge <matt.eldridge@us.ibm.com>
 * Paulo Henrique Lopes Ribeiro <paulo@majority.co>
+* Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
 * geemus <geemus@gmail.com>

data/examples/compute.md

@@ -27,6 +27,15 @@ If you are unfamiliar with fog, we recommend reading our [getting started](getti
    server.state # => 'Running', 'Stopped', 'Terminated', etc.
    ```
 
+1. Get a server's details using ip address
+
+   ```ruby
+   server = @sl.servers.get_by_ip(<server ip>)
+   server.name # => 'hostname.example.com'
+   server.created_at # => DateTime the server was created
+   server.state # => 'Running', 'Stopped', 'Terminated', etc.
+   ```
+
 1. Get all servers tagged with certain tags.
 
 	```ruby
@@ -288,4 +297,31 @@ If you are unfamiliar with fog, we recommend reading our [getting started](getti
 		srvr.ready # true
 		srvr.state # "Running"
 		
-	```
+	```
+
+
+1. Get all options to create a bare metal.
+
+   ```ruby
+   @sl.servers.get_bm_create_options
+   ```
+
+1. Get all options to create a VM.
+
+   ```ruby
+   @sl.servers.get_vm_create_options
+   ```
+
+1. Get all active tickets of a server.
+
+  ```ruby
+    server = @sl.servers.get(123456)
+    server.get_active_tickets
+  ```
+  
+1. Get all users of a server.
+
+  ```ruby
+    server = @sl.servers.get(123456)
+    server.get_users
+  ```  

data/lib/fog/softlayer/compute.rb

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/softlayer/core'
 require 'fog/softlayer/compute/shared'
 
 module Fog
@@ -47,13 +46,21 @@ module Fog
       request :delete_vm
       request :delete_vm_tags
       request :describe_tags
+      request :get_bare_metal_active_tickets
+      request :get_bare_metal_create_options
       request :get_bare_metal_server
+      request :get_bare_metal_server_by_ip
       request :get_bare_metal_servers
       request :get_bare_metal_tags
+      request :get_bare_metal_users
       request :get_key_pair
       request :get_key_pairs
       request :get_references_by_tag_name
       request :get_tag
+      request :get_virtual_guest_active_tickets
+      request :get_virtual_guest_by_ip
+      request :get_virtual_guest_create_options
+      request :get_virtual_guest_users
       request :get_vm_tags
       request :get_vm
       request :get_vms

data/lib/fog/softlayer/dns.rb

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/softlayer/core'
 require 'fog/softlayer/compute/shared'
 
 module Fog

data/lib/fog/softlayer/ext/hash.rb

@@ -0,0 +1,6 @@
+class Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    self.merge(second, &merger)
+  end
+end

data/lib/fog/softlayer/ext/string.rb

@@ -0,0 +1,20 @@
+## some helpers for some dirty work
+class String
+  def softlayer_camelize
+    self.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
+  end
+
+  def fix_convention_exceptions
+    # SLAPI WHY U No Follow Own Convention!?
+    self.gsub!(/ipaddress/i, 'IpAddress')
+    self.gsub!(/loadbalancer/i, 'LoadBalancer')
+  end
+
+  def softlayer_underscore
+    self.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+  end
+end

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

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Softlayer

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

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

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

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Softlayer

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

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

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

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Softlayer

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

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

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

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Softlayer

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

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

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

@@ -347,6 +347,16 @@ module Fog
           attributes[:tags].map { |i| i['tag']['name'] } if attributes[:tags]
         end
 
+        def get_active_tickets
+          return service.get_bare_metal_active_tickets(id).body if bare_metal?
+          service.get_virtual_guest_active_tickets(id).body
+        end
+
+        def get_users
+          return service.get_bare_metal_users(id).body if bare_metal?
+          service.get_virtual_guest_users(id).body
+        end
+
         private
 
         def network_connection

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

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/collection'
 require 'fog/softlayer/models/compute/server'
 
 module Fog
@@ -39,6 +38,23 @@ module Fog
           nil
         end
 
+        ## Get a SoftLayer server by ip.
+        #
+        def get_by_ip(ip)
+          return nil if ip.blank?
+          response = service.get_virtual_guest_by_ip(ip)
+          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_by_ip(ip)
+            bare_metal = true
+          end
+          data = response.body
+          data['bare_metal'] = bare_metal
+          new.merge_attributes(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
         def bootstrap(options={})
           server = service.create(options)
           server.wait_for { ready? }
@@ -54,6 +70,14 @@ module Fog
           end.flatten.uniq
           ids.map { |id| get(id) }
         end
+        
+        def get_bm_create_options
+          service.get_bare_metal_create_options.body
+        end
+
+        def get_vm_create_options
+          service.get_virtual_guest_create_options.body
+        end
       end
     end
   end

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

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Softlayer

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

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

data/lib/fog/softlayer/models/dns/domain.rb

@@ -4,7 +4,7 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
-require 'fog/core/model'
+
 require 'fog/softlayer/models/dns/records'
 
 module Fog

data/lib/fog/softlayer/models/dns/domains.rb

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

data/lib/fog/softlayer/models/dns/record.rb

@@ -4,7 +4,6 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
-require 'fog/core/model'
 
 module Fog
   module DNS

data/lib/fog/softlayer/models/dns/records.rb

@@ -4,7 +4,7 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
-require 'fog/core/collection'
+
 require 'fog/softlayer/models/dns/record'
 
 module Fog

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

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
-
 module Fog
   module Network
     class Softlayer

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

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/collection'
 require 'fog/softlayer/models/network/datacenter'
 
 module Fog

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

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
-
 module Fog
   module Network
     class Softlayer

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

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/collection'
 require 'fog/softlayer/models/network/ip'
 
 module Fog

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

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
-
 module Fog
   module Network
     class Softlayer

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

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/collection'
 require 'fog/softlayer/models/network/network'
 
 module Fog

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

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
-
 module Fog
   module Network
     class Softlayer

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

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/collection'
 require 'fog/softlayer/models/network/subnet'
 
 module Fog

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

@@ -4,7 +4,6 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
-require 'fog/core/model'
 
 module Fog
   module Network

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

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

data/lib/fog/softlayer/models/product/item.rb

@@ -4,7 +4,6 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
-require 'fog/core/model'
 
 module Fog
   module Softlayer

data/lib/fog/softlayer/models/product/items.rb

@@ -4,7 +4,6 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
-require 'fog/core/collection'
 
 module Fog
   module Softlayer

data/lib/fog/softlayer/models/product/package.rb

@@ -4,7 +4,6 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
-require 'fog/core/model'
 
 module Fog
   module Softlayer

data/lib/fog/softlayer/models/product/packages.rb

@@ -4,7 +4,6 @@
 #
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
-require 'fog/core/collection'
 
 module Fog
   module Softlayer

data/lib/fog/softlayer/models/storage/directories.rb

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/collection'
 require 'fog/softlayer/models/storage/directory'
 
 module Fog

data/lib/fog/softlayer/models/storage/directory.rb

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
 require 'fog/softlayer/models/storage/files'
 
 module Fog

data/lib/fog/softlayer/models/storage/file.rb

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/model'
-
 module Fog
   module Storage
     class Softlayer

data/lib/fog/softlayer/models/storage/files.rb

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/core/collection'
 require 'fog/softlayer/models/storage/file'
 
 module Fog

data/lib/fog/softlayer/network.rb

@@ -5,8 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/softlayer/core'
-
 module Fog
   module Network
     class Softlayer < Fog::Service

data/lib/fog/softlayer/product.rb

@@ -5,7 +5,6 @@
 # LICENSE: MIT (http://opensource.org/licenses/MIT)
 #
 
-require 'fog/softlayer/core'
 require 'fog/softlayer/compute/shared'
 
 module Fog

data/lib/fog/softlayer/requests/compute/create_bare_metal_server.rb

@@ -58,6 +58,7 @@ module Fog
                 'modifyDate' => nil,
                 'startCpus' => nil,
                 'statusId' => 1001,
+                'primaryIpAddress' => Fog::Mock.random_ip,
                 'globalIdentifier' => Fog::Softlayer.mock_global_identifier
             }
           rescue MissingRequiredParameter

data/lib/fog/softlayer/requests/compute/create_vms.rb

@@ -63,6 +63,7 @@ module Fog
                 'statusId' => 1001,
                 'globalIdentifier' => Fog::Softlayer.mock_global_identifier,
                 'operatingSystem' => {},
+                'primaryIpAddress' => Fog::Mock.random_ip,
                 'tagReferences' => []
             }
 

data/lib/fog/softlayer/requests/compute/get_bare_metal_active_tickets.rb

@@ -0,0 +1,79 @@
+#
+# Author:: Matheus Francisco Barra Mina (<mfbmina@gmail.com>)
+# © Copyright IBM Corporation 2015.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+module Fog
+  module Compute
+    class Softlayer
+      class Mock
+        # Gets all Bare Metal active tickets
+        # @param [Integer] id
+        # @return [Excon::Response]
+        def get_bare_metal_active_tickets(id)
+          response = Excon::Response.new
+          found = self.get_bare_metal_servers.body.map{|server| server['id']}.include?(id)
+          unless found
+            response.status = 404
+            response.body = {
+              "error" => "Unable to find object with id of '#{id}'.",
+              "code" => "SoftLayer_Exception_ObjectNotFound"
+            }
+          else
+            response.status = 200
+            response.body = get_active_tickets
+          end
+          response
+        end
+      end
+
+      class Real
+        def get_bare_metal_active_tickets(id)
+          request(:hardware_server, "#{id.to_s}/getActiveTickets", :http_method => :GET)
+        end
+      end
+    end
+  end
+end
+
+module Fog
+  module Compute
+    class Softlayer
+      class Mock
+        def get_active_tickets
+          [
+            {
+              "accountId"=>1,
+              "assignedUserId"=>1,
+              "billableFlag"=>nil,
+              "changeOwnerFlag"=>false,
+              "createDate"=>"2015-03-17T07:42:42-05:00",
+              "groupId"=>1,
+              "id"=>1,
+              "lastEditDate"=>"2015-03-17T07:42:43-05:00",
+              "lastEditType"=>"AUTO",
+              "locationId"=>nil,
+              "modifyDate"=>"2015-03-17T07:42:43-05:00",
+              "notifyUserOnUpdateFlag"=>true,
+              "originatingIpAddress"=>"10.10.10.10",
+              "priority"=>0,
+              "responsibleBrandId"=>1,
+              "serverAdministrationBillingAmount"=>nil,
+              "serverAdministrationBillingInvoiceId"=>nil,
+              "serverAdministrationFlag"=>0,
+              "serverAdministrationRefundInvoiceId"=>nil,
+              "serviceProviderId"=>1,
+              "serviceProviderResourceId"=>1,
+              "statusId"=>1,
+              "subjectId"=>1,
+              "title"=>"API Question - Testing API",
+              "totalUpdateCount"=>1,
+              "userEditableFlag"=>true
+            }
+          ]
+        end
+      end
+    end
+  end
+end