fog-profitbricks 2.0.1 → 3.0.0

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

@@ -52,47 +52,45 @@ module Fog
         #                                       Leave portRangeStart and portRangeEnd null to allow all ports
         #
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-firewall-rule]
-        def create_firewall_rule(datacenter_id, server_id, nic_id, options={})
+        def create_firewall_rule(datacenter_id, server_id, nic_id, options = {})
           firewall_rule = {
-              :properties => options
+            :properties => options
           }
 
           request(
-              :expects  => [202],
-              :method   => 'POST',
-              :path     => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}/firewallrules",
-              :body     => Fog::JSON.encode(firewall_rule)
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}/firewallrules",
+            :body     => Fog::JSON.encode(firewall_rule)
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
-        def create_firewall_rule(datacenter_id, server_id, nic_id, options={})
+        def create_firewall_rule(datacenter_id, server_id, nic_id, options = {})
           response = Excon::Response.new
           response.status = 202
 
           firewall_rule_id = Fog::UUID.uuid
           firewall_rule = {
-              'id'          => firewall_rule_id,
-              'type'        => 'nic',
-              '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',
-                  'createdBy'         => 'test@stackpointcloud.com',
-                  'etag'              => 'faa67fbacb1c0e2e02cf9650657251f2',
-                  'lastModifiedDate'  => '2015-03-18T19:00:51Z',
-                  'lastModifiedBy'    => 'test@stackpointcloud.com',
-                  'state'             => 'AVAILABLE'
-              },
-              'properties'      => options,
-              'datacenter_id'  => datacenter_id,
-              'server_id'       => server_id,
-              'nic_id'          => nic_id,
+            'id' => firewall_rule_id,
+            'type'        => 'nic',
+            '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',
+              'createdBy'         => 'test@stackpointcloud.com',
+              'etag'              => 'faa67fbacb1c0e2e02cf9650657251f2',
+              'lastModifiedDate'  => '2015-03-18T19:00:51Z',
+              'lastModifiedBy'    => 'test@stackpointcloud.com',
+              'state'             => 'AVAILABLE'
+            },
+            'properties' => options,
+            'datacenter_id' => datacenter_id,
+            'server_id'       => server_id,
+            'nic_id'          => nic_id
           }
 
-          self.data[:firewall_rules]['items'] << firewall_rule
+          data[:firewall_rules]['items'] << firewall_rule
           response.body = firewall_rule
 
           response
@@ -100,4 +98,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,40 +1,40 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                # Not a real API method; will only return flavor object.
-                def create_flavor(flavor_name, cores, ram)
-                    response        = Excon::Response.new
-                    response.status = 200
-                    response.body   = {
-                      'createFlavorResponse' => {
-                          'id'    => Fog::UUID.uuid,
-                          'name'  => flavor_name,
-                          'cores' => cores,
-                          'ram'   => ram,
-                      }
-                    }
-                    response
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Real
+        # Not a real API method; will only return flavor object.
+        def create_flavor(flavor_name, cores, ram)
+          response = Excon::Response.new
+          response.status = 200
+          response.body   = {
+            'createFlavorResponse' => {
+              'id' => Fog::UUID.uuid,
+              'name'  => flavor_name,
+              'cores' => cores,
+              'ram'   => ram
+            }
+          }
+          response
+        end
+      end
 
-            class Mock
-                def create_flavor(flavor_name, ram, cores)
-                    response = Excon::Response.new
-                    response.status = 200
+      class Mock
+        def create_flavor(flavor_name, ram, cores)
+          response = Excon::Response.new
+          response.status = 200
 
-                    flavor = {
-                      'id'    => Fog::UUID.uuid,
-                      'name'  => flavor_name,
-                      'ram'   => ram,
-                      'cores' => cores
-                    }
+          flavor = {
+            'id'    => Fog::UUID.uuid,
+            'name'  => flavor_name,
+            'ram'   => ram,
+            'cores' => cores
+          }
 
-                    self.data[:flavors] << flavor
-                    response.body = { 'createFlavorResponse' => flavor }
-                    response
-                end
-            end
+          data[:flavors] << flavor
+          response.body = { 'createFlavorResponse' => flavor }
+          response
         end
+      end
     end
-end
+  end
+end

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

@@ -32,17 +32,15 @@ module Fog
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-ip-block]
         def create_ip_block(options = {})
           ip_block = {
-              :properties => options
+            :properties => options
           }
 
           request(
-              :expects  => [202],
-              :method   => 'POST',
-              :path     => "/ipblocks",
-              :body     => Fog::JSON.encode(ip_block)
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/ipblocks",
+            :body     => Fog::JSON.encode(ip_block)
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
@@ -53,23 +51,23 @@ module Fog
             'id' => ipb_3_id,
             'type' => 'ipblock',
             'href' => "https://api.profitbricks.com/rest/v2/ipblocks/#{ipb_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'
+            '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' => {
-                'ips'    	  => ["777.777.777.777", "888.888.888.888", "999.999.999.999"],
-                'location'  => options[:location],
-                'size'	    => options[:size],
-                'name'      => options[:name]
+              'ips' => ["777.777.777.777", "888.888.888.888", "999.999.999.999"],
+              'location' => options[:location],
+              'size'	    => options[:size],
+              'name' => options[:name]
             }
           }
 
-          self.data[:ip_blocks]['items'] << ip_block
+          data[:ip_blocks]['items'] << ip_block
           response        = Excon::Response.new
           response.status = 202
           response.body   = ip_block
@@ -78,4 +76,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,160 +1,161 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                # Creates a LAN within a data center
-                #
-                # ==== Parameters
-                # * datacenter_id<~String> - Required - UUID of virtual data center
-                # * properties<~Hash>:
-                #   * name<~String>         - The name of the LAN
-                #   * public<~Integer>      - Boolean indicating if the LAN faces the public Internet or not
-                # * entities<~Hash>:
-                #   * nics<~Array>          - A collection of NICs associated with the LAN
-                #
-                # ==== Returns
-                # * response<~Excon::Response>:
-                #   * body<~Hash>:
-                #     * id<~String> 		  - The resource's unique identifier
-                #     * type<~String>		  - The type of the created resource
-                #     * href<~String>		  - URL to the object’s representation (absolute path)
-                #     * items<~Hash>      - Collection of individual lan objects
-                #       * id<~String> 		  - The resource's unique identifier
-                #       * type<~String>		  - The type of the created resource
-                #       * href<~String>		  - URL to the object’s representation (absolute path)
-                #       * metadata<~Hash>	  - Hash containing the LAN metadata
-                #         * createdDate<~String>		  - The date the resource was created
-                #         * createdBy<~String>		    - The user who created the resource
-                #         * etag<~String>				      - The etag for the resource
-                #         * lastModifiedDate<~String>	- The last time the resource has been modified
-                #         * lastModifiedBy<~String>	  - The user who last modified the resource
-                #         * state<~String>            - LAN state
-                #       * properties<~Hash> - Hash containing the LAN properties
-                #         * name<~String>             - The name of the LAN
-                #         * public<~Boolean>          - Boolean indicating if the LAN faces the public Internet or not
-                #       * entities<~Hash>   - Hash containing the LAN entities
-                #         * nics<~Hash> - Hash containing the NIC properties
-                #           * id<~String> 		  - The resource's unique identifier
-                #           * type<~String>		  - The type of the created resource
-                #           * href<~String>		  - URL to the object’s representation (absolute path)
-                #           * items<~Hash>      - Collection of individual nic objects
-                #             * id<~String> 		  - The resource's unique identifier
-                #             * type<~String>		  - The type of the created resource
-                #             * href<~String>		  - URL to the object’s representation (absolute path)
-                #             * metadata<~Hash>	  - Hash containing the NIC metadata
-                #               * createdDate<~String>		  - The date the resource was created
-                #               * createdBy<~String>		    - The user who created the resource
-                #               * etag<~String>				      - The etag for the resource
-                #               * lastModifiedDate<~String>	- The last time the resource has been modified
-                #               * lastModifiedBy<~String>	  - The user who last modified the resource
-                #               * state<~String>            - NIC state
-                #             * properties<~Hash> - Hash containing the NIC properties
-                #               * name<~String>             - The name of the NIC
-                #               * mac<~String>              - The MAC address of the NIC
-                #               * ips<~Array>               - IPs assigned to the NIC represented as a collection
-                #               * dhcp<~Boolean>            - Boolean value that indicates if the NIC is using DHCP or not
-                #               * lan<~Integer>             - The LAN ID the NIC sits on
-                #               * firewallActive<~Boolean>  - Once a firewall rule is added, this will reflect a true value
-                #             * entities<~Hash>           - Hash containing the NIC entities
-                #               * firewallrules<~Hash>      - A list of firewall rules associated to the NIC represented as a collection
-                #                 * id<~String>               - The resource's unique identifier
-                #                 * type<~String>			        - The type of the resource
-                #                 * href<~String>			        - URL to the object’s representation (absolute path)
-                #                 * items<~Array>			        - Collection of individual firewall rules objects
-                #                   * id<~String> 		        - The resource's unique identifier
-                #                   * type<~String>		        - The type of the resource
-                #                   * href<~String>		        - URL to the object’s representation (absolute path)
-                #                   * metadata<~Hash>	        - Hash containing the Firewall Rule metadata
-                #                     * createdDate<~String>		  - The date the resource was created
-                #                     * createdBy<~String>		    - The user who created the resource
-                #                     * etag<~String>				      - The etag for the resource
-                #                     * lastModifiedDate<~String>	- The last time the resource has been modified
-                #                     * lastModifiedBy<~String>	  - The user who last modified the resource
-                #                     * state<~String>            - Firewall Rule state
-                #                   * properties<~Hash>       - Hash containing the Firewall Rule properties
-                #                     * name<~String>             - The name of the Firewall Rule
-                #                     * protocol<~String>         - The protocol for the rule: TCP, UDP, ICMP, ANY
-                #                     * sourceMac<~Array>         - Only traffic originating from the respective MAC address is allowed.
-                #                                                   Valid format: aa:bb:cc:dd:ee:ff. Value null allows all source MAC address
-                #                     * sourceIp<~Boolean>        - Only traffic originating from the respective IPv4 address is allowed.
-                #                                                   Value null allows all source IPs
-                #                     * targetIp<~Integer>        - In case the target NIC has multiple IP addresses, only traffic directed
-                #                                                   to the respective IP address of the NIC is allowed. Value null allows all target IPs
-                #                     * icmpCode<~Boolean>        - Defines the allowed code (from 0 to 254) if protocol ICMP is chosen.
-                #                                                   Value null allows all codes.
-                #                     * icmpType<~Boolean>        - Defines the allowed type (from 0 to 254) if the protocol ICMP is chosen.
-                #                                                   Value null allows all types
-                #                     * portRangeStart<~Boolean>  - Defines the start range of the allowed port (from 1 to 65534)
-                #                                                   if protocol TCP or UDP is chosen. Leave portRangeStart and portRangeEnd
-                #                                                   value null to allow all ports
-                #                     * portRangeEnd<~Boolean>    - Defines the end range of the allowed port (from 1 to 65534)
-                #                                                   if the protocol TCP or UDP is chosen. Leave portRangeStart and
-                #                                                   portRangeEnd value null to allow all ports
-                #
-                # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-lan]
-                def create_lan(datacenter_id, properties={}, entities={})
-                    lan = {
-                        :properties => properties,
-                        :entities   => entities
-                    }
+  module Compute
+    class ProfitBricks
+      class Real
+        # Creates a LAN within a data center
+        #
+        # ==== Parameters
+        # * datacenter_id<~String> - Required - UUID of virtual data center
+        # * properties<~Hash>:
+        #   * name<~String>         - The name of the LAN
+        #   * public<~Integer>      - Boolean indicating if the LAN faces the public Internet or not
+        # * entities<~Hash>:
+        #   * nics<~Array>          - A collection of NICs associated with the LAN
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * id<~String> 		  - The resource's unique identifier
+        #     * type<~String>		  - The type of the created resource
+        #     * href<~String>		  - URL to the object’s representation (absolute path)
+        #     * items<~Hash>      - Collection of individual lan objects
+        #       * id<~String> 		  - The resource's unique identifier
+        #       * type<~String>		  - The type of the created resource
+        #       * href<~String>		  - URL to the object’s representation (absolute path)
+        #       * metadata<~Hash>	  - Hash containing the LAN metadata
+        #         * createdDate<~String>		  - The date the resource was created
+        #         * createdBy<~String>		    - The user who created the resource
+        #         * etag<~String>				      - The etag for the resource
+        #         * lastModifiedDate<~String>	- The last time the resource has been modified
+        #         * lastModifiedBy<~String>	  - The user who last modified the resource
+        #         * state<~String>            - LAN state
+        #       * properties<~Hash> - Hash containing the LAN properties
+        #         * name<~String>             - The name of the LAN
+        #         * public<~Boolean>          - Boolean indicating if the LAN faces the public Internet or not
+        #       * entities<~Hash>   - Hash containing the LAN entities
+        #         * nics<~Hash> - Hash containing the NIC properties
+        #           * id<~String> 		  - The resource's unique identifier
+        #           * type<~String>		  - The type of the created resource
+        #           * href<~String>		  - URL to the object’s representation (absolute path)
+        #           * items<~Hash>      - Collection of individual nic objects
+        #             * id<~String> 		  - The resource's unique identifier
+        #             * type<~String>		  - The type of the created resource
+        #             * href<~String>		  - URL to the object’s representation (absolute path)
+        #             * metadata<~Hash>	  - Hash containing the NIC metadata
+        #               * createdDate<~String>		  - The date the resource was created
+        #               * createdBy<~String>		    - The user who created the resource
+        #               * etag<~String>				      - The etag for the resource
+        #               * lastModifiedDate<~String>	- The last time the resource has been modified
+        #               * lastModifiedBy<~String>	  - The user who last modified the resource
+        #               * state<~String>            - NIC state
+        #             * properties<~Hash> - Hash containing the NIC properties
+        #               * name<~String>             - The name of the NIC
+        #               * mac<~String>              - The MAC address of the NIC
+        #               * ips<~Array>               - IPs assigned to the NIC represented as a collection
+        #               * dhcp<~Boolean>            - Boolean value that indicates if the NIC is using DHCP or not
+        #               * lan<~Integer>             - The LAN ID the NIC sits on
+        #               * firewallActive<~Boolean>  - Once a firewall rule is added, this will reflect a true value
+        #             * entities<~Hash>           - Hash containing the NIC entities
+        #               * firewallrules<~Hash>      - A list of firewall rules associated to the NIC represented as a collection
+        #                 * id<~String>               - The resource's unique identifier
+        #                 * type<~String>			        - The type of the resource
+        #                 * href<~String>			        - URL to the object’s representation (absolute path)
+        #                 * items<~Array>			        - Collection of individual firewall rules objects
+        #                   * id<~String> 		        - The resource's unique identifier
+        #                   * type<~String>		        - The type of the resource
+        #                   * href<~String>		        - URL to the object’s representation (absolute path)
+        #                   * metadata<~Hash>	        - Hash containing the Firewall Rule metadata
+        #                     * createdDate<~String>		  - The date the resource was created
+        #                     * createdBy<~String>		    - The user who created the resource
+        #                     * etag<~String>				      - The etag for the resource
+        #                     * lastModifiedDate<~String>	- The last time the resource has been modified
+        #                     * lastModifiedBy<~String>	  - The user who last modified the resource
+        #                     * state<~String>            - Firewall Rule state
+        #                   * properties<~Hash>       - Hash containing the Firewall Rule properties
+        #                     * name<~String>             - The name of the Firewall Rule
+        #                     * protocol<~String>         - The protocol for the rule: TCP, UDP, ICMP, ANY
+        #                     * sourceMac<~Array>         - Only traffic originating from the respective MAC address is allowed.
+        #                                                   Valid format: aa:bb:cc:dd:ee:ff. Value null allows all source MAC address
+        #                     * sourceIp<~Boolean>        - Only traffic originating from the respective IPv4 address is allowed.
+        #                                                   Value null allows all source IPs
+        #                     * targetIp<~Integer>        - In case the target NIC has multiple IP addresses, only traffic directed
+        #                                                   to the respective IP address of the NIC is allowed. Value null allows all target IPs
+        #                     * icmpCode<~Boolean>        - Defines the allowed code (from 0 to 254) if protocol ICMP is chosen.
+        #                                                   Value null allows all codes.
+        #                     * icmpType<~Boolean>        - Defines the allowed type (from 0 to 254) if the protocol ICMP is chosen.
+        #                                                   Value null allows all types
+        #                     * portRangeStart<~Boolean>  - Defines the start range of the allowed port (from 1 to 65534)
+        #                                                   if protocol TCP or UDP is chosen. Leave portRangeStart and portRangeEnd
+        #                                                   value null to allow all ports
+        #                     * portRangeEnd<~Boolean>    - Defines the end range of the allowed port (from 1 to 65534)
+        #                                                   if the protocol TCP or UDP is chosen. Leave portRangeStart and
+        #                                                   portRangeEnd value null to allow all ports
+        #
+        # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-lan]
+        def create_lan(datacenter_id, properties = {}, entities = {})
+          lan = {
+            :properties => properties,
+            :entities => entities
+          }
 
-                    request(
-                        :expects  => [202],
-                        :method   => 'POST',
-                        :path     => "/datacenters/#{datacenter_id}/lans",
-                        :body     => Fog::JSON.encode(lan)
-                    )
-                rescue => error
-                  Fog::Errors::NotFound.new(error)
-                end
-            end
+          request(
+            :expects => [202],
+            :method   => 'POST',
+            :path     => "/datacenters/#{datacenter_id}/lans",
+            :body     => Fog::JSON.encode(lan)
+          )
+        end
+      end
+
+      class Mock
+        def create_lan(datacenter_id, properties = {}, _entities = {})
+          response = Excon::Response.new
+          response.status = 202
+
+          if datacenter = data[:datacenters]['items'].find do |attrib|
+            attrib['id'] == datacenter_id
+          end
 
-            class Mock
-                def create_lan(datacenter_id, properties={}, entities={})
-                    response = Excon::Response.new
-                    response.status = 202
+            datacenter['properties']['version'] += 1 if datacenter['properties']
+            datacenter['version'] += 1 if datacenter['version']
 
-                    if datacenter = self.data[:datacenters]['items'].find {
-                        |attrib| attrib['id'] == datacenter_id
-                    }
-                      datacenter['version'] += 1
-                    else
-                        raise Fog::Errors::NotFound.new('Data center resource could not be found')
-                    end
+          else
+            raise Fog::Errors::NotFound, 'Data center resource could not be found'
+          end
 
-                    lan = {
-                        'id'          => '10',
-                        'type'        => 'nic',
-                        'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/lans/10",
-                        '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'            => properties[:name],
-                            'public'          => properties[:public]
-                        },
-                        'entities'    => {
-                            'nics' => {
-                                'id'    => '10/nics',
-                                'type'  => 'collection',
-                                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/lans/10/nics",
-                                'items' => [ ]
-                            }
-                        },
-                        'datacenter_id'  => datacenter_id
-                    }
+          lan = {
+            'id' => '10',
+            'type'        => 'nic',
+            'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/lans/10",
+            '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' => properties[:name],
+              'public' => properties[:public]
+            },
+            'entities' => {
+              'nics' => {
+                'id' => '10/nics',
+                'type'  => 'collection',
+                'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/lans/10/nics",
+                'items' => []
+              }
+            },
+            'datacenter_id' => datacenter_id
+          }
 
-                    self.data[:lans]['items'] << lan
+          data[:lans]['items'] << lan
 
-                    response.body = lan
-                    response
-                end
-            end
+          response.body = lan
+          response
         end
+      end
     end
+  end
 end