fog-profitbricks 4.0.0 → 4.1.0

data/lib/fog/profitbricks/requests/compute/create_datacenter.rb

@@ -9,6 +9,10 @@ module Fog
         #     * name<~String>         - The name of the data center
         #     * region<~String>       - The physical location where the data center will be created ("de/fkb", "de/fra", or "us/las")
         #     * description<~String>  - An optional description for the data center, e.g. staging, production.
+        #     * servers<~Hash>        - A collection of servers
+        #     * volumes<~Hash>        - A collection of volumes
+        #     * loadbalancers<~Hash>  - A collection of loadbalancers
+        #     * lans<~Hash>           - A collection of LANs in a data center
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -36,50 +40,92 @@ module Fog
         #       * lans<~Hash>                 - A collection that represents the LANs in a data center
         #
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-a-data-center]
-        def create_datacenter(options)
+        def create_datacenter(options, entities={})
           datacenter = {
-            :properties => options
+            :properties => options,
+            :entities => entities
           }
 
           request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => '/datacenters',
-            :body     => Fog::JSON.encode(datacenter)
+            :expects => [202],
+            :method => 'POST',
+            :path => '/datacenters',
+            :body => Fog::JSON.encode(datacenter)
           )
         end
       end
 
       class Mock
-        def create_datacenter(_options)
+        def create_datacenter(options, entities={})
+          dc = {
+            :properties => options,
+            :entities => entities
+          }
+
+          if dc[:properties][:location] == nil
+            raise Excon::Error::HTTPStatus, "Attribute 'location' is required"
+          end
+
           dc_3_id = Fog::UUID.uuid
+          dc_4_id = Fog::UUID.uuid
           datacenter = {
             'id' => dc_3_id,
             'type' => 'datacenter',
-            'href' => "https://api.profitbricks.com/rest/v2/datacenters/#{dc_3_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'
-            },
             'properties' => {
-              'name' => 'fog-demo',
-              'description' => 'testing fog rest implementation',
-              'location' => 'de/fra',
-              'version' => 1,
-              'features' => [
-
-              ]
+              'name' => dc[:properties][:name],
+              'description' => dc[:properties][:description],
+              'location' => dc[:properties][:location],
+              'version' => 1
             }
           }
 
+          if entities != nil and entities != {}
+            datacenter = {
+              'id' => dc_4_id,
+              'type' => 'datacenter',
+              'properties' => {
+                'name' => dc[:properties][:name],
+                'description' => dc[:properties][:description],
+                'location' => dc[:properties][:location],
+                'version' => 1
+              },
+              'entities' => {
+                'volumes' => {
+                  'items' =>
+                    [
+                      {
+                        'type' => 'volume',
+                        'properties' => {
+                          'name' => dc[:entities][:volumes][:items][0][:properties][:name],
+                          'type' => dc[:entities][:volumes][:items][0][:properties][:type],
+                          'size' => dc[:entities][:volumes][:items][0][:properties][:size],
+                          'bus' => dc[:entities][:volumes][:items][0][:properties][:bus],
+                          'licenceType' => dc[:entities][:volumes][:items][0][:properties][:licenceType],
+                          'availabilityZone' => dc[:entities][:volumes][:items][0][:properties][:availabilityZone]
+                        }
+                      }
+                    ]
+                },
+                'servers' => {
+                  'items' =>
+                    [
+                      {
+                        'properties' => {
+                          'name' => dc[:entities][:servers][:items][0][:properties][:name],
+                          'cores' => dc[:entities][:servers][:items][0][:properties][:cores],
+                          'ram' => dc[:entities][:servers][:items][0][:properties][:ram]
+                        }
+                      }
+                    ]
+                }
+              }
+            }
+          end
+
           data[:datacenters]['items'] << datacenter
-          response        = Excon::Response.new
+          response = Excon::Response.new
           response.status = 202
-          response.body   = datacenter
+          response.body = datacenter
           response
         end
       end

data/lib/fog/profitbricks/requests/compute/create_firewall_rule.rb

@@ -71,10 +71,17 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
+          properties = {}
+          properties['name'] = options[:name]
+          properties['protocol'] = options[:protocol]
+          properties['source_mac'] = options[:sourceMac]
+          properties['port_range_start'] = options[:portRangeStart]
+          properties['port_range_end'] = options[:portRangeEnd]
+
           firewall_rule_id = Fog::UUID.uuid
           firewall_rule = {
             'id' => firewall_rule_id,
-            'type'        => 'nic',
+            'type'        => 'firewall-rule',
             'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}/firewallrules/#{firewall_rule_id}",
             'metadata'    => {
               'createdDate' => '2015-03-18T19:00:51Z',
@@ -84,10 +91,10 @@ module Fog
               'lastModifiedBy'    => 'test@stackpointcloud.com',
               'state'             => 'AVAILABLE'
             },
-            'properties' => options,
+            'properties' => properties,
             'datacenter_id' => datacenter_id,
-            'server_id'       => server_id,
-            'nic_id'          => nic_id
+            'server_id'     => server_id,
+            'nic_id'        => nic_id
           }
 
           data[:firewall_rules]['items'] << firewall_rule

data/lib/fog/profitbricks/requests/compute/create_group.rb

@@ -56,6 +56,10 @@ module Fog
 
       class Mock
         def create_group(options = {})
+          if options[:name] == nil
+            raise Excon::Error::HTTPStatus, "Attribute 'name' is required"
+          end
+
           response = Excon::Response.new
           response.status = 202
 
@@ -67,10 +71,24 @@ module Fog
             'href'      => "https=>//api.profitbricks.com/rest/v4/um/groups/#{group_id}",
             'properties' => {
                 'name'              => options[:name],
-                'createDataCenter'  => options[:create_data_center],
-                'createSnapshot'    => options[:create_snapshot],
-                'reserveIp'         => options[:reserve_ip],
-                'accessActivityLog' => options[:access_activity_log]
+                'createDataCenter'  => options[:createDataCenter],
+                'createSnapshot'    => options[:createSnapshot],
+                'reserveIp'         => options[:reserveIp],
+                'accessActivityLog' => options[:accessActivityLog]
+            },
+            'entities' => {
+              'users' => {
+                'id' => "#{group_id}/owns",
+                'type' => 'collection',
+                'href' => "https://api.profitbricks.com/cloudapi/v4/um/groups/#{group_id}/users",
+                'items' => []
+              },
+              'resources' => {
+                'id' => "#{group_id}/resources",
+                'type' => 'collection',
+                'href' => "https://api.profitbricks.com/cloudapi/v4/um/groups/#{group_id}/resources",
+                'items' => []
+              }
             }
           }
 

data/lib/fog/profitbricks/requests/compute/create_ip_block.rb

@@ -60,7 +60,7 @@ module Fog
               'state'             => 'AVAILABLE'
             },
             'properties' => {
-              'ips' => ["777.777.777.777", "888.888.888.888", "999.999.999.999"],
+              'ips' => ["777.777.777.777", "888.888.888.888"],
               'location' => options[:location],
               'size'	    => options[:size],
               'name' => options[:name]

data/lib/fog/profitbricks/requests/compute/create_lan.rb

@@ -126,7 +126,7 @@ module Fog
 
           lan = {
             'id' => '10',
-            'type'        => 'nic',
+            'type'        => 'lan',
             'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/lans/10",
             'metadata'    => {
               'createdDate' => '2015-03-18T19:00:51Z',

data/lib/fog/profitbricks/requests/compute/create_load_balancer.rb

@@ -52,17 +52,18 @@ module Fog
       end
 
       class Mock
-        def create_load_balancer(datacenter_id, properties = {}, _entities = {})
+        def create_load_balancer(datacenter_id, properties = {}, entities = {})
           response = Excon::Response.new
           response.status = 202
 
           load_balancer_id  = Fog::UUID.uuid
           nic_1_id          = Fog::UUID.uuid
           serv_1_id         = Fog::UUID.uuid
+          properties[:ip] = '123.456.789'
 
           load_balancer = {
             'id' => load_balancer_id,
-            'type'        => 'nic',
+            'type'        => 'loadbalancer',
             'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}",
             'metadata'    => {
               'createdDate' => '2015-03-18T19:00:51Z',
@@ -73,47 +74,7 @@ module Fog
               'state'             => 'AVAILABLE'
             },
             'properties'      => properties,
-            'entities'        => {
-              'balancednics' => {
-                'id'    => "#{load_balancer_id}/balancednics",
-                'type'  => 'collection',
-                'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}/balancednics",
-                'items' =>
-                [
-                  {
-                    'id'          => nic_1_id,
-                    'type'        => 'nic',
-                    'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{serv_1_id}/nics/#{nic_1_id}",
-                    'metadata'    => {
-                      'createdDate'       => '2015-03-18T19:00:51Z',
-                      'createdBy'         => 'test@stackpointcloud.com',
-                      'etag'              => 'faa67fbacb1c0e2e02cf9650657251f1',
-                      'lastModifiedDate'  => '2015-03-18T19:00:51Z',
-                      'lastModifiedBy'    => 'test@stackpointcloud.com',
-                      'state'             => 'AVAILABLE'
-                    },
-                    'properties' => {
-                      'name'            => 'FogTestLoadBalancedNIC_1',
-                      'mac'             => '02:01:36:5f:09:da',
-                      'ips'             => ['10.9.194.12'],
-                      'dhcp'            => 'true',
-                      'lan'             => 2,
-                      'firewallActive'  => 'false'
-                    },
-                    'entities' => {
-                      'firewallrules' => {
-                        'id'    => "#{nic_1_id}/firewallrules",
-                        'type'  => 'collection',
-                        'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{serv_1_id}/nics/#{nic_1_id}/firewallrules",
-                        'items' => []
-                      }
-                    },
-                    'datacenter_id' => datacenter_id,
-                    'load_balancer_id' => load_balancer_id
-                  }
-                ]
-              }
-            },
+            'entities'        => entities,
             'datacenter_id' => datacenter_id
           }
 

data/lib/fog/profitbricks/requests/compute/create_nic.rb

@@ -89,6 +89,10 @@ module Fog
 
       class Mock
         def create_nic(datacenter_id, server_id, options = {}, entities = {})
+          if options[:lan] == nil
+            raise Excon::Error::HTTPStatus, "Attribute 'lan' is required"
+          end
+
           response = Excon::Response.new
           response.status = 202
 

data/lib/fog/profitbricks/requests/compute/create_server.rb

@@ -133,6 +133,10 @@ module Fog
 
       class Mock
         def create_server(datacenter_id, properties = {}, entities = {})
+          if properties[:cores] == nil
+            raise Excon::Error::HTTPStatus, "Attribute 'cores' is required"
+          end
+
           server_id = Fog::UUID.uuid
 
           volume_id = if entities[:volumes] && entities[:volumes]['items'] && entities[:volumes]['items'][0] && entities[:volumes]['items'][0]['id']
@@ -160,7 +164,8 @@ module Fog
               'ram'               => properties[:ram],
               'availabilityZone'  => properties[:availabilityZone],
               'vmState'           => 'RUNNING',
-              'cpuFamily' => properties[:cpuFamily]
+              'cpuFamily' => properties[:cpuFamily],
+              'bootVolume' => properties[:bootVolume]
             }
           }
 

data/lib/fog/profitbricks/requests/compute/create_user.rb

@@ -48,6 +48,10 @@ module Fog
 
       class Mock
         def create_user(options = {})
+          if options[:email] == nil
+            raise Excon::Error::HTTPStatus, "Attribute 'email' is required"
+          end
+
           response = Excon::Response.new
           response.status = 202
 
@@ -68,7 +72,22 @@ module Fog
                 'email'         => options[:email],
                 'password'      => options[:password],
                 'administrator' => options[:administrator],
-                'forceSecAuth'  => options[:force_sec_auth]
+                'forceSecAuth'  => options[:force_sec_auth] || false,
+                'secAuthActive'  => options[:sec_auth_active] || false
+            },
+            'entities' => {
+              'owns' => {
+                'id' => "#{user_id}/owns",
+                'type' => 'collection',
+                'href' => "https://api.profitbricks.com/cloudapi/v4/um/users/#{user_id}/owns",
+                'items' => []
+              },
+              'groups' => {
+                'id' => "#{user_id}/groups",
+                'type' => 'collection',
+                'href' => "https://api.profitbricks.com/cloudapi/v4/um/users/#{user_id}/groups",
+                'items' => []
+              }
             }
           }
 

data/lib/fog/profitbricks/requests/compute/create_volume.rb

@@ -77,13 +77,17 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
+          if options[:size] == nil
+            raise Excon::Error::HTTPStatus, "Attribute 'size' is required"
+          end
+
           if datacenter = data[:datacenters]['items'].find do |attrib|
             attrib['id'] == datacenter_id
           end
 
             datacenter['version'] += 1 if datacenter['version']
           else
-            raise Fog::Errors::NotFound, 'Data center resource could not be found'
+            raise Excon::Error::HTTPStatus, 'Resource does not exist'
           end
 
           volume_id = Fog::UUID.uuid

data/lib/fog/profitbricks/requests/compute/create_volume_snapshot.rb

@@ -84,7 +84,7 @@ module Fog
               'name' => options[:name],
               'description'         => options[:description],
               'location'            => 'us/las',
-              'size'                => 6,
+              'size'                => 5,
               'cpuHotPlug'          => 'true',
               'cpuHotUnplug'        => 'false',
               'ramHotPlug'          => 'false',

data/lib/fog/profitbricks/requests/compute/delete_group.rb

@@ -32,7 +32,7 @@ module Fog
             grp['id'] == group_id
           end
           else
-            raise Fog::Errors::NotFound, "The requested resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
           response

data/lib/fog/profitbricks/requests/compute/delete_share.rb

@@ -31,7 +31,7 @@ module Fog
             shr['id'] == resource_id
           end
           else
-            raise Fog::Errors::NotFound, "The requested resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
           response

data/lib/fog/profitbricks/requests/compute/delete_user.rb

@@ -32,7 +32,7 @@ module Fog
             usr['id'] == user_id
           end
           else
-            raise Fog::Errors::NotFound, "The requested resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
           response

data/lib/fog/profitbricks/requests/compute/detach_cdrom.rb

@@ -32,14 +32,14 @@ module Fog
             serv['datacenter_id'] == datacenter_id && serv['id'] == server_id
           end
           else
-            raise Fog::Errors::NotFound, "The server resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
-          if cdrom = server['entities']['cdroms']['items'].find do |cd|
+          if cdrom = server['cdroms']['items'].find do |cd|
             cd['id'] == cdrom_id
           end
           else
-            raise Fog::Errors::NotFound, "The attached volume resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
           response

data/lib/fog/profitbricks/requests/compute/get_attached_cdrom.rb

@@ -57,14 +57,14 @@ module Fog
             serv['datacenter_id'] == datacenter_id && serv['id'] == server_id
           end
           else
-            raise Fog::Errors::NotFound, "The server resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
-          if cdrom = server['entities']['cdroms']['items'].find do |cd|
+          if cdrom = server['cdroms']['items'].find do |cd|
             cd['id'] == cdrom_image_id
           end
           else
-            raise Fog::Errors::NotFound, "The attached volume resource could not be found"
+            raise Excon::Error::HTTPStatus, "Resource does not exist"
           end
 
           response        = Excon::Response.new