fog-profitbricks 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5debfdaf3a325763e5c2bbab6cfe3579ba9b59
-  data.tar.gz: d393b090eb06d77179d0e0ee328fe1fefa58b5b7
+  metadata.gz: 6123ec4b71596d36e147a4df95374deaaea32d2a
+  data.tar.gz: c60c12fd9550e860665bbe65a548240a39adcb38
 SHA512:
-  metadata.gz: 9686e4a271e84a6ce971cbb061d3b14c865da0b226d1aa9de2848dc3f49215a5d01cb2aae37b4961a22fef957a0d1f1d28251162c6aa96a31cd45f7875238365
-  data.tar.gz: 8fb85e43f65b3ae9a78b7521270e6e9ce5d1382f61ac2881c639a57d03ba73d3d2c6050a4ecb88e416cfde902f82a985bafcda98b888cddbad65394dace447e5
+  metadata.gz: 79023d8d754c7420f9a16ce8f72c05042abec768f5e0dae76888994e48e0f96d9b518046642168e9437f763e6cff060afb7ecd1891670083ffb0cfcbad821e62
+  data.tar.gz: 3eb2578a46b7521ca18f5c17227f0d99d90a8222f5da3a497da588c698b09ab5a75d8436c1a8d0cc30476aea57a955795a715bf695359045f149d247f36b7113

data/.travis.yml

@@ -7,8 +7,6 @@ script: bundle exec rake travis
 
 matrix:
   include:
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.1.8.7
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile.1.9.2+
       env: COVERAGE=true
@@ -24,6 +22,6 @@ matrix:
     - rvm: 2.3.0
       gemfile: Gemfile
       env: COVERAGE=true
-    - rvm: jruby
+    - rvm: jruby-head
       gemfile: gemfiles/Gemfile.1.9.2+
       env: COVERAGE=true

data/Rakefile

@@ -16,7 +16,7 @@ end
 namespace :test do
   mock = ENV["FOG_MOCK"] || "true"
   task :travis do
-    sh("export FOG_MOCK=#{mock} && bundle exec shindont")
+    sh("export PROFITBRICKS_USERNAME=username && export PROFITBRICKS_PASSWORD=abc123xyz && export FOG_MOCK=#{mock} && bundle exec shindont")
   end
 end
 

data/examples/pb_demo.rb

@@ -2,13 +2,7 @@ require 'fog/profitbricks'
 
 Excon.defaults[:connection_timeout] = 200
 
-compute = Fog::Compute.new(:provider => 'ProfitBricks')
-
-# Find the Ubuntu 16 image in North America.
-image = compute.images.all.find do |image|
-  image.name =~ /Ubuntu-16/ &&
-    image.location == 'us/las'
-end
+compute = Fog::Compute.new(:provider => 'ProfitBricks', :profitbricks_username => ENV['PROFITBRICKS_USERNAME'], :profitbricks_password => ENV['PROFITBRICKS_PASSWORD'])
 
 # Create datacenter.
 datacenter = compute.datacenters.create(:name => 'fog-demo',
@@ -29,7 +23,7 @@ lan = compute.lans.create(:datacenter_id => datacenter.id,
 system_volume = {
   :name => 'system',
   :size => 5,
-  :image => image.id,
+  :image_alias => "ubuntu:latest",
   :image_password => 'volume2016',
   :ssh_keys => ['ssh-rsa AAAAB3NzaC1yc2EAAAADA=='],
   :type => 'HDD'

data/lib/fog/profitbricks/compute.rb

@@ -6,7 +6,7 @@ module Fog
       autoload :Base, File.expand_path('../models/base', __FILE__)
 
       requires    :profitbricks_username, :profitbricks_password
-      recognizes  :profitbricks_url
+      recognizes  :profitbricks_url, :profitbricks_user_agent
 
       # Models
       model_path 'fog/profitbricks/models/compute'
@@ -51,127 +51,128 @@ module Fog
 
       # Requests
       request_path 'fog/profitbricks/requests/compute'
-      request    :create_server                  # createServer
-      request    :delete_server                  # deleteServer
-      request    :update_server                  # updateServer
-      request    :get_all_servers                # getAllServers
-      request    :get_server                     # getServer
-      request    :list_attached_volumes          # listAttachedVolumes
-      request    :attach_volume                  # attachVolume
-      request    :get_attached_volume            # getAttachedVolume
-      request    :detach_volume                  # detachVolume
-      request    :list_attached_cdroms           # listAttachedCdroms
-      request    :attach_cdrom                   # attachCdrom
-      request    :get_attached_cdrom             # getAttachedCdrom
-      request    :detach_cdrom                   # detachCdrom
-      request    :reboot_server                  # rebootServer
-      request    :start_server                   # startServer
-      request    :stop_server                    # stopServer
+      request    :create_server           	  	   # createServer
+      request    :delete_server           	  	   # deleteServer
+      request    :update_server           	  	   # updateServer
+      request    :get_all_servers         	  	   # getAllServers
+      request    :get_server              	  	   # getServer
+      request    :list_attached_volumes   	  	   # listAttachedVolumes
+      request    :attach_volume           	  	   # attachVolume
+      request    :get_attached_volume     	  	   # getAttachedVolume
+      request    :detach_volume           	  	   # detachVolume
+      request    :list_attached_cdroms    	  	   # listAttachedCdroms
+      request    :attach_cdrom            	  	   # attachCdrom
+      request    :get_attached_cdrom      	  	   # getAttachedCdrom
+      request    :detach_cdrom            	  	   # detachCdrom
+      request    :reboot_server           	  	   # rebootServer
+      request    :start_server            	  	   # startServer
+      request    :stop_server             	  	   # stopServer
 
-      request    :create_datacenter              # createDataCenter
-      request    :delete_datacenter              # deleteDataCenter
-      request    :update_datacenter              # updateDataCenter
-      request    :get_all_datacenters            # getAllDataCenters
-      request    :get_datacenter                 # getDataCenter
+      request    :create_datacenter      	  	   # createDataCenter
+      request    :delete_datacenter      	  	   # deleteDataCenter
+      request    :update_datacenter      	  	   # updateDataCenter
+      request    :get_all_datacenters    	  	   # getAllDataCenters
+      request    :get_datacenter         	  	   # getDataCenter
 
-      request    :get_all_locations              # getAllLocations
-      request    :get_location                   # getLocation
+      request    :get_all_locations       	  	   # getAllLocations
+      request    :get_location            	  	   # getLocation
 
-      request    :get_all_images                 # getAllImages
-      request    :get_image                      # getImage
-      request    :update_image                   # updateImage
-      request    :delete_image                   # deleteImage
+      request    :get_all_images          	  	   # getAllImages
+      request    :get_image               	  	   # getImage
+      request    :update_image            	  	   # updateImage
+      request    :delete_image            	  	   # deleteImage
 
-      request    :get_all_flavors                # getAllFlavors
-      request    :get_flavor                     # getFlavor
-      request    :create_flavor                  # createFlavor
+      request    :get_all_flavors         	  	   # getAllFlavors
+      request    :get_flavor              	  	   # getFlavor
+      request    :create_flavor           	  	   # createFlavor
 
-      request    :create_volume                  # createVolume
-      request    :delete_volume                  # deleteVolume
-      request    :update_volume                  # updateVolume
-      request    :get_all_volumes                # getAllVolumes
-      request    :get_volume                     # getVolume
-      request    :create_volume_snapshot         # createVolumeSnapshot
-      request    :restore_volume_snapshot        # restoreVolumeSnapshot
+      request    :create_volume           	  	   # createVolume
+      request    :delete_volume           	  	   # deleteVolume
+      request    :update_volume           	  	   # updateVolume
+      request    :get_all_volumes         	  	   # getAllVolumes
+      request    :get_volume              	  	   # getVolume
+      request    :create_volume_snapshot  	  	   # createVolumeSnapshot
+      request    :restore_volume_snapshot 	  	   # restoreVolumeSnapshot
 
-      request    :get_all_lans                   # getAllLans
-      request    :get_lan                        # getLans
-      request    :create_lan                     # createLan
-      request    :update_lan                     # updateLan
-      request    :delete_lan                     # deleteLan
+      request    :get_all_lans            	  	   # getAllLans
+      request    :get_lan                 	  	   # getLans
+      request    :create_lan              	  	   # createLan
+      request    :update_lan              	  	   # updateLan
+      request    :delete_lan              	  	   # deleteLan
 
-      request    :create_nic                     # createNic
-      request    :delete_nic                     # deleteNic
-      request    :update_nic                     # updateNic
-      request    :get_all_nic                    # getAllNic
-      request    :get_nic                        # getNic
+      request    :create_nic              	  	   # createNic
+      request    :delete_nic              	  	   # deleteNic
+      request    :update_nic              	  	   # updateNic
+      request    :get_all_nic             	  	   # getAllNic
+      request    :get_nic                 	  	   # getNic
 
-      request    :delete_snapshot                # deleteSnapshot
-      request    :update_snapshot                # updateSnapshot
-      request    :get_all_snapshots              # getAllSnapshots
-      request    :get_snapshot                   # getSnapshot
+      request    :delete_snapshot         	  	   # deleteSnapshot
+      request    :update_snapshot         	  	   # updateSnapshot
+      request    :get_all_snapshots       	  	   # getAllSnapshots
+      request    :get_snapshot            	  	   # getSnapshot
 
-      request    :get_all_requests               # getAllRequests
-      request    :get_request                    # getRequest
-      request    :get_request_status             # getRequestStatus
+      request    :get_all_requests        	  	   # getAllRequests
+      request    :get_request             	  	   # getRequest
+      request    :get_request_status          	   # getRequestStatus
 
-      request    :get_all_ip_blocks              # getAllIpBlocks
-      request    :get_ip_block                   # getIpBlock
-      request    :create_ip_block                # createIpBlock
-      request    :delete_ip_block                # deleteIpBlock
+      request    :get_all_ip_blocks           	   # getAllIpBlocks
+      request    :get_ip_block                	   # getIpBlock
+      request    :create_ip_block             	   # createIpBlock
+      request    :delete_ip_block             	   # deleteIpBlock
 
-      request    :get_all_firewall_rules         # getAllFireWallRules
-      request    :get_firewall_rule              # getFirewallRule
-      request    :create_firewall_rule           # createFirewallRule
-      request    :update_firewall_rule           # updateFirewallRule
-      request    :delete_firewall_rule           # deleteFirewallRule
+      request    :get_all_firewall_rules      	   # getAllFireWallRules
+      request    :get_firewall_rule           	   # getFirewallRule
+      request    :create_firewall_rule        	   # createFirewallRule
+      request    :update_firewall_rule        	   # updateFirewallRule
+      request    :delete_firewall_rule        	   # deleteFirewallRule
 
-      request    :get_all_load_balancers         # getAllLoadBalancers
-      request    :get_load_balancer              # getLoadBalancer
-      request    :create_load_balancer           # createLoadBalancer
-      request    :delete_load_balancer           # deleteLoadBalancer
-      request    :update_load_balancer           # deleteLoadBalancer
-      request    :get_all_load_balanced_nics     # getAllLoadBalancedNics
-      request    :get_load_balanced_nic          # getLoadBalancedNic
-      request    :associate_nic_to_load_balancer # associateNicToLoadBalancer
-      request    :remove_nic_association         # removeNicAssociation
+      request    :get_all_load_balancers      	   # getAllLoadBalancers
+      request    :get_load_balancer           	   # getLoadBalancer
+      request    :create_load_balancer        	   # createLoadBalancer
+      request    :delete_load_balancer        	   # deleteLoadBalancer
+      request    :update_load_balancer        	   # deleteLoadBalancer
+      request    :get_all_load_balanced_nics  	   # getAllLoadBalancedNics
+      request    :get_load_balanced_nic       	   # getLoadBalancedNic
+      request    :associate_nic_to_load_balancer  # associateNicToLoadBalancer
+      request    :remove_nic_association          # removeNicAssociation
 
-      request    :get_all_contract_resources     # getAllContractResources
+      request    :get_all_contract_resources      # getAllContractResources
 
-      request    :get_all_groups                 # getAllGroups
-      request    :get_group                      # getGroup
-      request    :create_group                   # createGroup
-      request    :update_group                   # updateGroup
-      request    :delete_group                   # deleteGroup
+      request    :get_all_groups      	           # getAllGroups
+      request    :get_group           	           # getGroup
+      request    :create_group        	           # createGroup
+      request    :update_group        	           # updateGroup
+      request    :delete_group        	           # deleteGroup
 
-      request    :get_all_shares                 # getAllShares
-      request    :get_share                      # getShare
-      request    :add_share                      # addShare
-      request    :update_share                   # updateShare
-      request    :delete_share                   # deleteShare
+      request    :get_all_shares      	           # getAllShares
+      request    :get_share           	           # getShare
+      request    :add_share        	             # addShare
+      request    :update_share        	           # updateShare
+      request    :delete_share        	           # deleteShare
 
-      request    :get_all_users                  # getAllUsers
-      request    :get_user                       # getUser
-      request    :create_user                    # createUser
-      request    :update_user                    # updateUser
-      request    :delete_user                    # deleteUser
-      request    :get_group_users                # getGroupUsers
-      request    :add_user_to_group              # addUserToGroup
-      request    :remove_user_from_group         # removeUserFromGroup
+      request    :get_all_users      	           # getAllUsers
+      request    :get_user           	           # getUser
+      request    :create_user        	           # createUser
+      request    :update_user        	           # updateUser
+      request    :delete_user        	           # deleteUser
+      request    :get_group_users     	           # getGroupUsers
+      request    :add_user_to_group     	         # addUserToGroup
+      request    :remove_user_from_group     	   # removeUserFromGroup
 
-      request    :get_all_resources              # getAllResources
-      request    :get_resources_by_type          # getResourcesByType
-      request    :get_resource_by_type           # getResourcesByType
+      request    :get_all_resources      	       # getAllResources
+      request    :get_resources_by_type      	   # getResourcesByType
+      request    :get_resource_by_type      	     # getResourcesByType
 
       class Real
         def initialize(options = {})
           @profitbricks_username = options[:profitbricks_username]
           @profitbricks_password = options[:profitbricks_password]
           @profitbricks_url      = options[:profitbricks_url] || "https://api.profitbricks.com"
+          @user_agent            = options[:profitbricks_user_agent] || ""
 
           connection_options = options[:connection_options] || {}
           connection_options[:headers] ||= {}
-          connection_options[:headers]["User-Agent"] = Fog::Core::Connection.user_agents.to_s
+          connection_options[:headers]["User-Agent"] = @user_agent != "" ?  @user_agent + " " + Fog::Core::Connection.user_agents.to_s : Fog::Core::Connection.user_agents.to_s
           connection_options[:omit_default_port] = true
           connection_options[:path_prefix] = "/cloudapi/#{API_VERSION}"
 
@@ -185,6 +186,7 @@ module Fog
 
           begin
             response = @connection.request(params)
+
           rescue Excon::Errors::Unauthorized => error
             Logger.warning('Unauthorized error')
             raise error, Fog::JSON.decode(error.response.body)['messages']
@@ -263,7 +265,7 @@ module Fog
                       'description' => 'testing fog rest implementation',
                       'location'    => 'us/las',
                       'version'     => 1,
-                      'features'    => %w[SSD MULTIPLE_CPU]
+                      'features'    => %w(SSD MULTIPLE_CPU)
                     }
                   },
                   {
@@ -283,7 +285,7 @@ module Fog
                       'description' => 'testing fog rest implementation',
                       'location'    => 'de/fkb',
                       'version'     => 1,
-                      'features'    => %w[SSD MULTIPLE_CPU]
+                      'features'    => %w(SSD MULTIPLE_CPU)
                     }
                   }
                 ]
@@ -477,7 +479,7 @@ module Fog
                     'href'        => 'https://api.profitbricks.com/rest/v2/locations/de/fkb',
                     'properties'  => {
                       'name'      => 'karlsruhe',
-                      'features'  => %w[SSD MULTIPLE_CPU]
+                      'features'  => %w(SSD MULTIPLE_CPU)
                     }
                   },
                   {
@@ -486,7 +488,7 @@ module Fog
                     'href'        => 'https://api.profitbricks.com/rest/v2/locations/de/fra',
                     'properties'  => {
                       'name'      => 'frankfurt',
-                      'features'  => %w[SSD MULTIPLE_CPU]
+                      'features'  => %w(SSD MULTIPLE_CPU)
                     }
                   },
                   {
@@ -495,7 +497,7 @@ module Fog
                     'href'        => 'https://api.profitbricks.com/rest/v2/locations/us/las',
                     'properties'  => {
                       'name'      => 'lasvegas',
-                      'features'  => %w[SSD MULTIPLE_CPU]
+                      'features'  => %w(SSD MULTIPLE_CPU)
                     }
                   }
                 ]
@@ -539,6 +541,38 @@ module Fog
                       'public'              => 'true'
                     }
                   },
+                  {
+                    'id'              => 'dfcb40db-28b5-11e6-9336-52540005ab80',
+                    'type'            => 'image',
+                    'href'            => 'https=>//api.profitbricks.com/rest/v2/images/dfcb40db-28b5-11e6-9336-52540005ab80',
+                    'metadata'        => {
+                      'createdDate'       => '2016-06-02T11:33:49Z',
+                      'createdBy'         => 'System',
+                      'etag'              => '9909709d99655c6f31aca789998d7d89',
+                      'lastModifiedDate'  => '2016-06-02T11:33:49Z',
+                      'lastModifiedBy'    => 'System',
+                      'state'             => 'AVAILABLE'
+                    },
+                    'properties' => {
+                      'name'                => 'CentOS-6.8-x86_64-netinstall.iso',
+                      'description'         => '',
+                      'location'            => 'us/las',
+                      'size'                => 0.23,
+                      'cpuHotPlug'          => 'true',
+                      'cpuHotUnplug'        => 'false',
+                      'ramHotPlug'          => 'true',
+                      'ramHotUnplug'        => 'false',
+                      'nicHotPlug'          => 'true',
+                      'nicHotUnplug'        => 'true',
+                      'discVirtioHotPlug'   => 'true',
+                      'discVirtioHotUnplug' => 'true',
+                      'discScsiHotPlug'     => 'false',
+                      'discScsiHotUnplug'   => 'false',
+                      'licenceType'         => 'LINUX',
+                      'imageType'           => 'HDD',
+                      'public'              => 'true'
+                    }
+                  },
                   {
                     'id'              => '05cadf29-6c12-11e4-beeb-52540066fee9',
                     'type'            => 'image',
@@ -1098,9 +1132,10 @@ module Fog
                 ]
               },
               :contracts => {
-                'contractNumber' => '12345678',
-                'owner' => 'test@domain.com',
-                'status' => 'BILLABLE',
+                'type' => 'contract',
+                'contractNumber'  => '12345678',
+                'owner'  => 'test@domain.com',
+                'status'  => 'BILLABLE',
                 'resourceLimits' => {
                   'coresPerServer'        => '20',
                   'coresPerContract'      => '30',
@@ -1116,8 +1151,117 @@ module Fog
                   'ssdVolumeProvisioned'  => '0',
                   'reservableIps'         => '3',
                   'reservedIpsOnContract' => '0',
-                  'reservedIpsInUse'      => '0'
+                  'reservedIpsInUse'      => '0',
                 }
+              },
+              :groups => {
+                'id'    => "groups",
+                'type'  => 'collection',
+                'href'  => "https://api.profitbricks.com/cloudapi/v4/um/groups",
+                'items' => []
+              },
+              :shares => {
+                'id'    => "059c4d71-f97a-4bfd-b3a5-XXXXXXXXXXXX/shares",
+                'type'  => 'collection',
+                'href'  => "https://api.profitbricks.com/cloudapi/v4/um/groups/059c4d71-f97a-4bfd-b3a5-XXXXXXXXXXXX/shares",
+                'items' => []
+              },
+              :users => {
+                'id'    => "users",
+                'type'  => 'collection',
+                'href'  => "https://api.profitbricks.com/cloudapi/v4/users",
+                'items' => []
+              },
+              :resources => {
+                'id'    => "resources",
+                'type'  => 'collection',
+                'href'  => "https://api.profitbricks.com/cloudapi/v4/um/resources",
+                'items' => [
+                  {
+                    'id'        => dc1_id,
+                    'type'      => 'datacenter',
+                    'href'      => "https://api.profitbricks.com/cloudapi/v4/um/resources/datacenter/#{dc1_id}",
+                    'metadata'  => {
+                      'createdDate' => '2016-07-31T15:41:27Z',
+                      'createdBy'         => 'test@stackpointcloud.com',
+                      'etag'              => '5b91832ee85a758568d4523a86bd8702',
+                      'lastModifiedDate'  => '2016-07-31T15:41:27Z',
+                      'lastModifiedBy'    => 'test@stackpointcloud.com',
+                      'state'             => 'AVAILABLE'
+                    },
+                    'entities' => {
+                      'groups' => {
+                        'id' => "#{dc1_id}/groups",
+                        'type' => 'collection',
+                        'href' => "https://api.profitbricks.com/cloudapi/v4/um/groups",
+                        'items' => []
+                      }
+                    }
+                  },
+                  {
+                    'id'              => 'dfcb40db-28b5-11e6-9336-52540005ab80',
+                    'type'            => 'image',
+                    'href'            => 'https://api.profitbricks.com/cloudapi/v4/um/resources/image/dfcb40db-28b5-11e6-9336-52540005ab80',
+                    'metadata'        => {
+                      'createdDate'       => '2016-06-02T11:33:49Z',
+                      'createdBy'         => 'System',
+                      'etag'              => '9909709d99655c6f31aca789998d7d89',
+                      'lastModifiedDate'  => '2016-06-02T11:33:49Z',
+                      'lastModifiedBy'    => 'System',
+                      'state'             => 'AVAILABLE'
+                    },
+                    'entities' => {
+                      'groups' => {
+                        'id' => "dfcb40db-28b5-11e6-9336-52540005ab80/groups",
+                        'type' => 'collection',
+                        'href' => "https://api.profitbricks.com/cloudapi/v4/um/groups",
+                        'items' => []
+                      }
+                    }
+                  },
+                  {
+                    'id'          => '3d52b13d-bec4-49de-ad05-fd2f8c687be6',
+                    'type'        => 'snapshot',
+                    'href'        => 'https://api.profitbricks.com/cloudapi/v4/um/resources/snapshot/3d52b13d-bec4-49de-ad05-fd2f8c687be6',
+                    'metadata'    => {
+                      'createdDate'       => '2016-08-07T22:28:38Z',
+                      'createdBy'         => 'test@stackpointcloud.com',
+                      'etag'              => '83ad78a4757ab0d9bdeaebc3a6485dcf',
+                      'lastModifiedDate'  => '2016-08-07T22:28:38Z',
+                      'lastModifiedBy'    => 'test@stackpointcloud.com',
+                      'state'             => 'AVAILABLE'
+                    },
+                    'entities' => {
+                      'groups' => {
+                        'id' => "3d52b13d-bec4-49de-ad05-fd2f8c687be6/groups",
+                        'type' => 'collection',
+                        'href' => "https://api.profitbricks.com/cloudapi/v4/um/groups",
+                        'items' => []
+                      }
+                    }
+                  },
+                  {
+                    'id' => ipb1_id,
+                    'type' => 'ipblock',
+                    'href' => "https://api.profitbricks.com/cloudapi/v4/um/resources/ipblock/#{ipb1_id}",
+                    'metadata' => {
+                      'createdDate'       => '2016-07-31T15:41:27Z',
+                      'createdBy'         => 'test@stackpointcloud.com',
+                      'etag'              => '5b91832ee85a758568d4523a86bd8702',
+                      'lastModifiedDate'  => '2016-07-31T15:41:27Z',
+                      'lastModifiedBy'    => 'test@stackpointcloud.com',
+                      'state'             => 'AVAILABLE'
+                    },
+                    'entities' => {
+                      'groups' => {
+                        'id' => "#{ipb1_id}/groups",
+                        'type' => 'collection',
+                        'href' => "https://api.profitbricks.com/cloudapi/v4/um/groups",
+                        'items' => []
+                      }
+                    }
+                  }
+                ]
               }
             }
           end