softlayer_api 3.0.2 → 3.1.0

data/lib/softlayer/VirtualServerOrder.rb

@@ -84,6 +84,12 @@ module SoftLayer
     attr_accessor :private_vlan_id
 
     # String, The URI of a post provisioning script to run on this server once it is created
+    attr_accessor :provision_script_uri
+
+    # String, The URI of a post provisioning script to run on this server once it is created
+    #
+    # DEPRECATION WARNING: This attribute is deprecated in favor of provision_script_uri
+    # and will be removed in the next major release.
     attr_accessor :provision_script_URI
 
     # Integer, The id of the public VLAN this server should join
@@ -102,7 +108,7 @@ module SoftLayer
     # Corresponds to +primaryBackendNetworkComponent.networkVlan.id+ in the +createObject+ documentation
     attr_accessor :user_metadata
 
-    # Create a new order that works thorugh the given client connection
+    # Create a new order that works through the given client connection
     def initialize (client = nil)
       @softlayer_client = client || Client.default_client
       raise "#{__method__} requires a client but none was given and Client::default_client is not set" if !@softlayer_client
@@ -156,13 +162,14 @@ module SoftLayer
       template['dedicatedAccountHostOnlyFlag'] = true if @dedicated_host_only
       template['privateNetworkOnlyFlag'] = true if @private_network_only
 
-      template['datacenter'] = {"name" => @datacenter.name} if @datacenter
-      template['userData'] = [{'value' => @user_metadata}] if @user_metadata
-      template['networkComponents'] = [{'maxSpeed'=> @max_port_speed}] if @max_port_speed
-      template['postInstallScriptUri'] = @provision_script_URI.to_s if @provision_script_URI
-      template['sshKeys'] = @ssh_key_ids.collect { |ssh_key_id| {'id'=> ssh_key_id.to_i } } if @ssh_key_ids
-      template['primaryNetworkComponent'] = { "networkVlan" => { "id" => @public_vlan_id.to_i } } if @public_vlan_id
+      template['datacenter']                     = {"name" => @datacenter.name}     if @datacenter
+      template['userData']                       = [{'value' => @user_metadata}]    if @user_metadata
+      template['networkComponents']              = [{'maxSpeed'=> @max_port_speed}] if @max_port_speed
+      template['postInstallScriptUri']           = @provision_script_URI.to_s       if @provision_script_URI
+      template['postInstallScriptUri']           = @provision_script_uri.to_s       if @provision_script_uri
+      template['primaryNetworkComponent']        = { "networkVlan" => { "id" => @public_vlan_id.to_i } } if @public_vlan_id
       template['primaryBackendNetworkComponent'] = { "networkVlan" => {"id" => @private_vlan_id.to_i } } if @private_vlan_id
+      template['sshKeys']                        = @ssh_key_ids.collect { |ssh_key_id| {'id'=> ssh_key_id.to_i } } if @ssh_key_ids
 
       if @image_template
           template['blockDeviceTemplateGroup'] = {"globalIdentifier" => @image_template.global_id}
@@ -232,7 +239,7 @@ module SoftLayer
     end
 
     ##
-    # Returns a list of the valid :os_refrence_codes
+    # Returns a list of the valid :os_reference_codes
     def self.os_reference_code_options(client = nil)
       create_object_options(client)['operatingSystems'].collect { |os_spec| os_spec['template']['operatingSystemReferenceCode'] }.uniq.sort!
     end

data/lib/softlayer/VirtualServerOrder_Package.rb

@@ -42,14 +42,14 @@ module SoftLayer
     # The domain of the server being created (i.e. 'softlayer.com' is the domain of sldn.softlayer.com)
     attr_accessor :domain
 
-    # The value of this property should be a hash. The keys of the hash are ProdcutItemCategory
+    # The value of this property should be a hash. The keys of the hash are ProductItemCategory
     # codes (like 'os' and 'ram') while the values may be Integers or Objects. The Integer values
     # should be the +id+ of a +SoftLayer_Product_Item_Price+ representing the configuration option
     # chosen for that category. Objects must respond to the +price_id+ message and return an integer
     # that is the +id+ of a +SoftLayer_Product_Item_Price+. Instances of the ProductConfigurationOption
     # class behave this way.
     #
-    # At a minimum, the configuation_options should include entries for each of the categories
+    # At a minimum, the configuration_options should include entries for each of the categories
     # required by the package (i.e. those returned from ProductPackage#required_categories)
     attr_accessor :configuration_options
 
@@ -65,8 +65,23 @@ module SoftLayer
     # be installed on the server.
     attr_accessor :image_template
 
+    # Integer, The id of the public VLAN this server should join
+    # Corresponds to +primaryNetworkComponent.networkVlan.id+ in the +createObject+ documentation
+    attr_accessor :public_vlan_id
+
+    # Integer, The id of the private VLAN this server should join
+    # Corresponds to +primaryBackendNetworkComponent.networkVlan.id+ in the +createObject+ documentation
+    attr_accessor :private_vlan_id
+
+    # The URI of a script to execute on the server after it has been provisioned. This may be
+    # any object which accepts the to_s message. The resulting string will be passed to SoftLayer API.
+    attr_accessor :provision_script_uri
+
     # The URI of a script to execute on the server after it has been provisioned. This may be
     # any object which accepts the to_s message. The resulting string will be passed to SoftLayer API.
+    #
+    # DEPRECATION WARNING: This attribute is deprecated in favor of provision_script_uri
+    # and will be removed in the next major release.
     attr_accessor :provision_script_URI
 
     # An array of the ids of SSH keys to install on the server upon provisioning
@@ -139,11 +154,14 @@ module SoftLayer
 
       #Note that the use of image_template and SoftLayer::ProductPackage os/guest_diskX configuration category
       #item prices is mutually exclusive.
-      product_order['imageTemplateGlobalIdentifier'] = @image_template.global_id         if @image_template
-      product_order['location']                      = @datacenter.id                    if @datacenter
-      product_order['provisionScripts']              = [@provision_script_URI.to_s]      if @provision_script_URI
-      product_order['sshKeys']                       = [{ 'sshKeyIds' => @ssh_key_ids }] if @ssh_key_ids
-      product_order['virtualGuests'][0]['userData']  = @user_metadata                    if @user_metadata
+      product_order['imageTemplateGlobalIdentifier']  = @image_template.global_id         if @image_template
+      product_order['location']                       = @datacenter.id                    if @datacenter
+      product_order['provisionScripts']               = [@provision_script_URI.to_s]      if @provision_script_URI
+      product_order['provisionScripts']               = [@provision_script_uri.to_s]      if @provision_script_uri
+      product_order['sshKeys']                        = [{ 'sshKeyIds' => @ssh_key_ids }] if @ssh_key_ids
+      product_order['virtualGuests'][0]['userData']   = @user_metadata                    if @user_metadata
+      product_order['primaryNetworkComponent']        = { "networkVlan" => { "id" => @public_vlan_id.to_i } } if @public_vlan_id
+      product_order['primaryBackendNetworkComponent'] = { "networkVlan" => {"id" => @private_vlan_id.to_i } } if @private_vlan_id
 
       product_order['prices'] = @configuration_options.collect do |key, value|
         if value.respond_to?(:price_id)

data/lib/softlayer/VirtualServerUpgradeOrder.rb

@@ -108,7 +108,7 @@ module SoftLayer
     end
 
     ##
-    # Searches through the upgrade items pricess known to this server for the one that is in a particular category
+    # Searches through the upgrade items prices known to this server for the one that is in a particular category
     # and whose capacity matches the value given. Returns the item_price or nil
     #
     def _item_price_with_capacity(which_category, capacity)

data/lib/softlayer/base.rb

@@ -12,7 +12,7 @@ require 'rubygems'
 module SoftLayer
   # The version number (including major, minor, and bugfix numbers)
   # This should change in accordance with the concept of Semantic Versioning
-  VERSION = "3.0.2"  # version history in the CHANGELOG.textile file at the root of the source
+  VERSION = "3.1.0"  # version history in the CHANGELOG.textile file at the root of the source
 
   # The base URL of the SoftLayer API available to the public internet.
   API_PUBLIC_ENDPOINT = 'https://api.softlayer.com/xmlrpc/v3/'

data/lib/softlayer/object_mask_helpers.rb

@@ -68,7 +68,7 @@ end
 # object masks
 class Array
   # Returns a string representing the object mask content represented by the
-  # Array. Each value in the array is converted to its object mask eqivalent
+  # Array. Each value in the array is converted to its object mask equivalent
   # This routine is an implementation detail used in the conversion of hashes
   # to object mask strings. You should not have to call this method directly.
   def _to_sl_object_mask_property()

data/lib/softlayer_api.rb

@@ -5,6 +5,7 @@
 #++
 
 # requirements from the core libraries
+require 'date'
 require 'time'
 
 # Requirements for the Foundation Layer
@@ -23,6 +24,7 @@ require 'softlayer/Datacenter'
 require 'softlayer/DynamicAttribute'
 require 'softlayer/Account'
 require 'softlayer/AccountPassword'
+require 'softlayer/NetworkMonitor'
 require 'softlayer/Server'
 require 'softlayer/BareMetalServer'
 require 'softlayer/BareMetalServerOrder'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: softlayer_api
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - SoftLayer Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configparser
@@ -130,6 +130,7 @@ files:
 - lib/softlayer/ModelBase.rb
 - lib/softlayer/NetworkComponent.rb
 - lib/softlayer/NetworkMessageDelivery.rb
+- lib/softlayer/NetworkMonitor.rb
 - lib/softlayer/NetworkService.rb
 - lib/softlayer/NetworkStorage.rb
 - lib/softlayer/NetworkStorageAllowedHost.rb
@@ -182,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Library for accessing the SoftLayer API