1and1 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e41d8147cf2aabbaee841afb697d77612dcbdf2d
-  data.tar.gz: 4c128aa7b9bb8701c88dba0a022d4bd57bf992b4
+SHA256:
+  metadata.gz: da9f83330d724b4ff872998ae85d34a7ee8d79eb8791fb6e0d5e655b86490c49
+  data.tar.gz: 195f9a5705f95bf6554d7e2629c7f4233edb7a865a51f33853fe3dd8feaade04
 SHA512:
-  metadata.gz: b25dc67b606c36e26934fba61cfb6c02366a237b243c398a8e14bb861f9748a4bd7eb1546324547cfa41e2537e39c0865fbf27e031b74a904fb7e8b2ac8b16d5
-  data.tar.gz: e2a17d27b1e073f6d62e22a4ce683ed70b37eccf41bd82267bd2800a90c5ed14a4c7c6f2a55f1790dbe0b74bd4f05ac55fc1738ec1574637865dc964d5b21e26
+  metadata.gz: '0083742bdc94b5f9d539484e3b6b74992b11b45796e1c6f85b15337c3c6c3e0d8b18dcb5799d8770a7fe2b875701c785416152b645471a587a7c2529f8e83fad'
+  data.tar.gz: 2d5b5add6ae7909bb574b35a8586ef0a5f59d44692a2d1ff556bba19c644942313f3383312e99ebc3bffde587bf04796d4bb16e69a94e927ca35049b04d78e6b

data/1and1.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "1and1"
-  spec.version       = "1.2.0"
+  spec.version       = "1.3.0"
   spec.authors       = ["Tyler Burkhardt (stackpointcloud.com)"]
   spec.email         = "tyler@stackpointcloud.com"
   spec.summary       = "Official 1&1 SDK for Ruby"

data/README.md

@@ -150,8 +150,8 @@ firewall = OneAndOne::Firewall.new
 # Create Rules
 rule1 = {
   'protocol' => 'TCP',
-  'port_from' => 80,
-  'port_to' => 80,
+  'port' => 80,
+  'action' => 'allow',
   'source' => '0.0.0.0'
 }
 

data/docs/reference.md

@@ -657,17 +657,6 @@ response = server.release_ip(server_id: '<SERVER-ID>', ip_id: '<IP-ID>')
 ```
 
 
-**Remove a firewall policy from a server's IP:**
-
-```
-response = server.remove_firewall(ip_id: '<IP-ID>')
-
-OR
-
-response = server.remove_firewall(server_id: '<SERVER-ID>', ip_id: '<IP-ID>')
-```
-
-
 **Remove a load balancer from a server's IP:**
 
 ```
@@ -998,9 +987,9 @@ response = firewall.rule(firewall_id: '<FIREWALL-ID>', rule_id: '<RULE-ID>')
 ```
 rule1 = {
   'protocol' => 'TCP',
-  'port_from' => 80,
-  'port_to' => 80,
-  'source' => '0.0.0.0'
+  'port' => 80,
+  'source' => '0.0.0.0',
+  'action' => 'allow'
 }
 
 rules = [rule1]
@@ -1017,9 +1006,9 @@ response = firewall.create(name: 'Test Firewall',
 ```
 rule2 = {
   'protocol' => 'TCP',
-  'port_from' => 90,
-  'port_to' => 90,
-  'source' => '0.0.0.0'
+  'port' => 90,
+  'source' => '0.0.0.0',
+  'action' => 'allow'
 }
 
 rules = [rule2]
@@ -1082,19 +1071,6 @@ response = firewall.remove_rule(firewall_id: '<FIREWALL-ID>', rule_id: '<RULE-ID
 ```
 
 
-**Remove a firewall policy's IP:**
-
-```
-response = firewall.remove_ip(ip_id: '<IP-ID>')
-
-OR
-
-response = firewall.remove_ip(firewall_id: '<FIREWALL-ID>', ip_id: '<IP-ID>')
-```
-
-
-
-
 # <a name="load-balancers"></a>Load Balancers
 
 Get started by instantiating a `LoadBalancer` object:

data/examples/firewall_examples.rb

@@ -1,137 +1,131 @@
-# List all firewall policies on your account
-firewall = OneAndOne::Firewall.new()
+require_relative '../lib/oneandone'
 
-response = firewall.list
+token =ENV['ONEANDONE_TOKEN']
+OneAndOne.start(token)
 
-puts JSON.pretty_generate(response)
+appliance = OneAndOne::ServerAppliance.new()
 
+appliances = appliance.list(q:'ubuntu')
 
+for aplnc in appliances
+  if aplnc['type'] == "IMAGE"
+    break
+  end
+end
 
-# Create a firewall policy
-firewall = OneAndOne::Firewall.new()
+# Create a new server
+server = OneAndOne::Server.new()
 
-rule1 = {
-  'protocol' => 'TCP',
-  'port_from' => 80,
-  'port_to' => 80,
-  'source' => '0.0.0.0'
+hdd1 = {
+    'size' => 120,
+    'is_main' => true
 }
 
-rules = [rule1]
+hdds = [hdd1]
 
-response = firewall.create(name: 'Test Firewall', description: 'Example Desc',
-  rules: rules)
+response = server.create(name: 'Ruby Example Server3', vcore: 1,
+                         cores_per_processor: 1, ram: 1,
+                         appliance_id: aplnc['id'], hdds: hdds)
 
 puts JSON.pretty_generate(response)
+## Wait for server to deploy before performing other actions ##
+puts "\nCreating server, please wait..."
+server.wait_for
 
+serverResp = server.get
 
-
-# Retrieve a firewall policy's current specs
+# Create a firewall policy
 firewall = OneAndOne::Firewall.new()
 
-response = firewall.get(firewall_id: '<FIREWALL-ID>')
-
-puts JSON.pretty_generate(response)
+rule1 = {
+    'protocol' => 'TCP',
+    'port_from' => 80,
+    'port_to' => 80,
+    'source' => '0.0.0.0'
+}
 
+rules = [rule1]
 
+fwResp = firewall.create(name: 'Ruby Test Firewall3', description: 'Example Desc',
+                           rules: rules)
 
-# Modify a firewall policy
-firewall = OneAndOne::Firewall.new()
+puts JSON.pretty_generate(fwResp)
 
-response = firewall.modify(firewall_id: '<FIREWALL-ID>', name: 'New Name')
-
-puts JSON.pretty_generate(response)
+firewall.wait_for
 
 
+# Add IPs to a firewall policy
+ip1 = serverResp['ips'][0]['id']
 
-# Delete a firewall policy
-firewall = OneAndOne::Firewall.new()
+ips = [ip1]
 
-response = firewall.delete(firewall_id: '<FIREWALL-ID>')
+response = firewall.add_ips(firewall_id: fwResp['id'], ips: ips)
 
 puts JSON.pretty_generate(response)
 
-
-
-# List the IPs assigned to a firewall policy
-firewall = OneAndOne::Firewall.new()
-
-response = firewall.ips(firewall_id: '<FIREWALL-ID>')
+# List all firewall policies on your account
+response = firewall.list
 
 puts JSON.pretty_generate(response)
 
+# Retrieve a firewall policy's current specs
+response = firewall.get(firewall_id: fwResp['id'])
 
+puts JSON.pretty_generate(response)
 
-# Retrieve information about an IP assigned to a firewall policy
-firewall = OneAndOne::Firewall.new()
 
-response = firewall.ip(firewall_id: '<FIREWALL-ID>', ip_id: '<IP-ID>')
+# Modify a firewall policy
+response = firewall.modify(firewall_id: fwResp['id'], name: 'New Name')
 
 puts JSON.pretty_generate(response)
 
+# List the IPs assigned to a firewall policy
+response = firewall.ips(firewall_id: fwResp['id'])
 
+puts JSON.pretty_generate(response)
 
-# Add IPs to a firewall policy
-firewall = OneAndOne::Firewall.new()
-
-ip1 = '<IP-ID>'
 
-ips = [ip1]
 
-response = firewall.add_ips(firewall_id: '<FIREWALL-ID>', ips: ips)
+# Retrieve information about an IP assigned to a firewall policy
+response = firewall.ip(firewall_id: fwResp['id'], ip_id: ip1)
 
 puts JSON.pretty_generate(response)
 
+# Add new rules to a firewall policy
+rule2 = {
+    'protocol' => 'TCP',
+    'port' => 90,
+    'action' => 'allow',
+    'source' => '0.0.0.0'
+}
 
+rules = [rule2]
 
-# Remove a firewall policy's IP
-firewall = OneAndOne::Firewall.new()
-
-response = firewall.remove_ip(firewall_id: '<FIREWALL-ID>', ip_id: '<IP-ID>')
-
-puts JSON.pretty_generate(response)
+ruleResp = firewall.add_rules(firewall_id: fwResp['id'], rules: rules)
 
+puts JSON.pretty_generate(ruleResp)
 
 
 # List a firewall policy's rules
-firewall = OneAndOne::Firewall.new()
-
-response = firewall.rules(firewall_id: '<FIREWALL-ID>')
+response = firewall.rules(firewall_id: fwResp['id'])
 
 puts JSON.pretty_generate(response)
 
 
-
 # Retrieve information about a firewall policy's rule
-firewall = OneAndOne::Firewall.new()
-
-response = firewall.rule(firewall_id: '<FIREWALL-ID>', rule_id: '<RULE-ID>')
+response = firewall.rule(firewall_id: fwResp['id'], rule_id: response[0]['id'])
 
 puts JSON.pretty_generate(response)
 
-
-
-# Add new rules to a firewall policy
-firewall = OneAndOne::Firewall.new()
-
-rule2 = {
-  'protocol' => 'TCP',
-  'port_from' => 90,
-  'port_to' => 90,
-  'source' => '0.0.0.0'
-}
-
-rules = [rule2]
-
-response = firewall.add_rules(firewall_id: '<FIREWALL-ID>', rules: rules)
+# Remove a rule
+response = firewall.remove_rule(firewall_id: fwResp['id'], rule_id: response['id'])
 
 puts JSON.pretty_generate(response)
 
+server.wait_for
+server.delete(server_id: serverResp['id'])
+server.wait_deleted(server_id: serverResp['id'])
 
-
-# Remove a rule
-firewall = OneAndOne::Firewall.new()
-
-response = firewall.remove_rule(firewall_id: '<FIREWALL-ID>', rule_id: '<RULE-ID>')
-
-puts JSON.pretty_generate(response)
+firewall.wait_for
+# Delete a firewall policy
+firewall.delete(firewall_id: fwResp['id'])

data/examples/server_examples.rb

@@ -268,15 +268,6 @@ puts JSON.pretty_generate(response)
 
 
 
-# Remove a server IP's firewall
-server = OneAndOne::Server.new()
-
-response = server.remove_firewall(server_id: '<SERVER-ID>', ip_id: '<IP-ID>')
-
-puts JSON.pretty_generate(response)
-
-
-
 # List a server IP's load balancers
 server = OneAndOne::Server.new()
 

data/lib/1and1/firewall.rb

@@ -257,28 +257,6 @@ module OneAndOne
     end
 
 
-    def remove_ip(firewall_id: @id, ip_id: nil)
-
-      # If user passed in firewall ID, reassign
-      @id = firewall_id
-
-      # Build URL
-      path = OneAndOne.build_url("/firewall_policies/#{@id}/server_ips/#{ip_id}")
-
-      # Perform request
-      response = @connection.request(:method => :delete,
-        :path => path,
-        :headers => $header)
-
-      # Check response status
-      OneAndOne.check_response(response.body, response.status)
-
-      #JSON-ify the response string
-      JSON.parse(response.body)
-
-    end
-
-
     def rules(firewall_id: @id)
 
       # If user passed in firewall ID, reassign

data/lib/1and1/server.rb

@@ -227,6 +227,7 @@ module OneAndOne
 
     end
 
+
     def get_baremetal(baremetal_id: @id)
 
       # If user passed in baremetal ID, reassign
@@ -740,28 +741,6 @@ module OneAndOne
     end
 
 
-    def remove_firewall(server_id: @id, ip_id: nil)
-
-      # If user passed in server ID, reassign
-      @id = server_id
-
-      # Build URL
-      path = OneAndOne.build_url("/servers/#{@id}/ips/#{ip_id}/firewall_policy")
-
-      # Perform request
-      response = @connection.request(:method => :delete,
-                                     :path => path,
-                                     :headers => $header)
-
-      # Check response status
-      OneAndOne.check_response(response.body, response.status)
-
-      #JSON-ify the response string
-      JSON.parse(response.body)
-
-    end
-
-
     def load_balancers(server_id: @id, ip_id: nil)
 
       # If user passed in server ID, reassign
@@ -1269,6 +1248,49 @@ module OneAndOne
 
     end
 
+    def wait_deleted(server_id: @id, timeout: 25, interval: 15)
+
+      # Capture start time
+      start = Time.now
+
+      # If user passed in server ID, reassign
+      @id = server_id
+
+      # Build URL
+      path = OneAndOne.build_url("/servers/#{@id}")
+
+      # Perform request
+      response = @connection.request(:method => :get,
+                                     :path => path,
+                                     :headers => $header)
+
+#      OneAndOne.check_response(response.body, response.status)
+
+      puts "before until #{response.status}"
+      # Keep polling the server's state until 404
+      until response.status == 404
+
+        # Wait 15 seconds before polling again
+        sleep interval
+        puts "checking server deleted status #{response.status}"
+        # Perform request
+        response = @connection.request(:method => :get,
+                                       :path => path,
+                                       :headers => $header)
+
+        # Calculate current duration and check for timeout
+        duration = (Time.now - start) / 60
+        if duration > timeout
+          puts "The operation timed out after #{timeout} minutes.\n"
+          return
+        end
+      end
+
+      # Return Duration
+      {:duration => duration}
+
+    end
+
 
   end
 

data/sphinx/_build/html/_sources/firewalls.txt

@@ -120,19 +120,6 @@ Firewall Policies
      :rtype: JSON
 
 
-   .. rb:method:: remove_ip(firewall_id: @id, ip_id: nil)
-
-     Remove an IP from a firewall policy.
-
-     :param firewall_id: the unique identifier for the firewall policy.
-     :type firewall_id: ``str``
-
-     :param ip_id: the unique identifier for the IP.
-     :type ip_id: ``str``
-
-     :rtype: JSON
-
-
    .. rb:method:: rules(firewall_id: @id)
 
      Returns a list the firewall policy's rules.

data/sphinx/_build/html/_sources/servers.txt

@@ -380,20 +380,6 @@ Servers
 
 
 
-    .. rb:method:: remove_firewall(server_id: @id, ip_id: nil)
-
-       Remove a firewall policy from a server's IP.
-
-       :param server_id: the unique identifier for the server.
-       :type server_id: ``str``
-
-       :param ip_id: the unique identifier for the server's IP.
-       :type ip_id: ``str``
-
-       :rtype: JSON
-
-
-
     .. rb:method:: load_balancers(server_id: @id, ip_id: nil)
 
        Returns a list of the load balancers assigned to a server IP.

data/sphinx/_build/html/firewalls.html

@@ -218,27 +218,6 @@ that match your search query.</li>
 </table>
 </dd></dl>
 
-<dl class="method">
-<dt id="remove_ip">
-<code class="descname">remove_ip</code><span class="sig-paren">(</span><em>firewall_id: &#64;id</em>, <em>ip_id: nil</em><span class="sig-paren">)</span><a class="headerlink" href="#remove_ip" title="Permalink to this definition">¶</a></dt>
-<dd><p>Remove an IP from a firewall policy.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>firewall_id</strong> (<code class="docutils literal"><span class="pre">str</span></code>) &#8211; the unique identifier for the firewall policy.</li>
-<li><strong>ip_id</strong> (<code class="docutils literal"><span class="pre">str</span></code>) &#8211; the unique identifier for the IP.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><p class="first last">JSON</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
 <dl class="method">
 <dt id="rules">
 <code class="descname">rules</code><span class="sig-paren">(</span><em>firewall_id: &#64;id</em><span class="sig-paren">)</span><a class="headerlink" href="#rules" title="Permalink to this definition">¶</a></dt>

data/sphinx/_build/html/servers.html

@@ -543,27 +543,6 @@ is not possible to resize to a fixed instance with a HDD smaller than the curren
 </table>
 </dd></dl>
 
-<dl class="method">
-<dt id="remove_firewall">
-<code class="descname">remove_firewall</code><span class="sig-paren">(</span><em>server_id: &#64;id</em>, <em>ip_id: nil</em><span class="sig-paren">)</span><a class="headerlink" href="#remove_firewall" title="Permalink to this definition">¶</a></dt>
-<dd><p>Remove a firewall policy from a server&#8217;s IP.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>server_id</strong> (<code class="docutils literal"><span class="pre">str</span></code>) &#8211; the unique identifier for the server.</li>
-<li><strong>ip_id</strong> (<code class="docutils literal"><span class="pre">str</span></code>) &#8211; the unique identifier for the server&#8217;s IP.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><p class="first last">JSON</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
 <dl class="method">
 <dt id="load_balancers">
 <code class="descname">load_balancers</code><span class="sig-paren">(</span><em>server_id: &#64;id</em>, <em>ip_id: nil</em><span class="sig-paren">)</span><a class="headerlink" href="#load_balancers" title="Permalink to this definition">¶</a></dt>

data/sphinx/firewalls.rst

@@ -120,19 +120,6 @@ Firewall Policies
      :rtype: JSON
 
 
-   .. rb:method:: remove_ip(firewall_id: @id, ip_id: nil)
-
-     Remove an IP from a firewall policy.
-
-     :param firewall_id: the unique identifier for the firewall policy.
-     :type firewall_id: ``str``
-
-     :param ip_id: the unique identifier for the IP.
-     :type ip_id: ``str``
-
-     :rtype: JSON
-
-
    .. rb:method:: rules(firewall_id: @id)
 
      Returns a list the firewall policy's rules.

data/sphinx/servers.rst

@@ -379,21 +379,6 @@ Servers
        :rtype: JSON
 
 
-
-    .. rb:method:: remove_firewall(server_id: @id, ip_id: nil)
-
-       Remove a firewall policy from a server's IP.
-
-       :param server_id: the unique identifier for the server.
-       :type server_id: ``str``
-
-       :param ip_id: the unique identifier for the server's IP.
-       :type ip_id: ``str``
-
-       :rtype: JSON
-
-
-
     .. rb:method:: load_balancers(server_id: @id, ip_id: nil)
 
        Returns a list of the load balancers assigned to a server IP.

data/test/mock-api/create-fp.json

@@ -9,8 +9,9 @@
   {
     "id": "DA5CC179ED00079AE7DE595F0073D86E",
     "protocol": "TCP",
-    "port_from": 80,
-    "port_to": 80,
+    "port": 80,
+    "action": "allow",
+    "description": "some desc",
     "source": "0.0.0.0"
   },
   {

data/test/test_mock_firewall.rb

@@ -43,9 +43,10 @@ class TestFirewall < Minitest::Test
     
     rule1 = {
       'protocol' => 'TCP',
-      'port_from' => 80,
-      'port_to' => 80,
-      'source' => '0.0.0.0'
+      'port' => 80,
+      'source' => '0.0.0.0',
+      'action' => 'allow',
+      'description' => 'some desc'
     }
 
     rules = [rule1]
@@ -192,27 +193,6 @@ class TestFirewall < Minitest::Test
   end
 
 
-  def test_remove_ip
-
-    # Read in mock JSON
-    file = File.read('mock-api/remove-ip-fp.json')
-    data = JSON.parse(file)
-
-    # Create stub and perform call
-    Excon.stub({:method => :delete, :path => "/v1/firewall_policies/#{data['id']}/server_ips/IP-ID"},
-      {:body => JSON.generate(data), :status => 202})
-    
-    response = @firewall.remove_ip(firewall_id: data['id'], ip_id: 'IP-ID')
-
-    # Assertions
-    assert_equal response['server_ips'].length, 0
-
-    # Clear out stubs
-    Excon.stubs.clear
-
-  end
-
-
   def test_rules
 
     # Read in mock JSON
@@ -267,9 +247,10 @@ class TestFirewall < Minitest::Test
     
     rule2 = {
       'protocol' => 'TCP',
-      'port_from' => 90,
-      'port_to' => 90,
-      'source' => '0.0.0.0'
+      'port' => 90,
+      'source' => '0.0.0.0',
+      'action' => 'allow',
+      'description' => 'some desc'
     }
 
     rules = [rule2]

data/test/test_mock_server.rb

@@ -13,7 +13,7 @@ class TestServer < Minitest::Test
   def test_list
     
     # Read in mock JSON
-    file = File.read('mock-api/list-servers.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/list-servers.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -34,7 +34,7 @@ class TestServer < Minitest::Test
   def test_create
 
     # Read in mock JSON
-    file = File.read('mock-api/create-server.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/create-server.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -65,7 +65,7 @@ class TestServer < Minitest::Test
   def test_list_fixed
 
     # Read in mock JSON
-    file = File.read('mock-api/fixed-server-flavors.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/fixed-server-flavors.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -86,7 +86,7 @@ class TestServer < Minitest::Test
   def test_get_fixed
 
     # Read in mock JSON
-    file = File.read('mock-api/get-fixed-server.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/get-fixed-server.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -108,7 +108,7 @@ class TestServer < Minitest::Test
   def test_get
 
     # Read in mock JSON
-    file = File.read('mock-api/get-server.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/get-server.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -130,7 +130,7 @@ class TestServer < Minitest::Test
   def test_modify
 
     # Read in mock JSON
-    file = File.read('mock-api/modify-server.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/modify-server.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -151,7 +151,7 @@ class TestServer < Minitest::Test
   def test_delete
 
     # Read in mock JSON
-    file = File.read('mock-api/delete-server.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/delete-server.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -173,7 +173,7 @@ class TestServer < Minitest::Test
   def test_hardware
 
     # Read in mock JSON
-    file = File.read('mock-api/get-hardware.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/get-hardware.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -196,7 +196,7 @@ class TestServer < Minitest::Test
   def test_modify_hardware
 
     # Read in mock JSON
-    file = File.read('mock-api/modify-server-hardware.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/modify-server-hardware.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -218,7 +218,7 @@ class TestServer < Minitest::Test
   def test_hdds
 
     # Read in mock JSON
-    file = File.read('mock-api/list-hdds.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/list-hdds.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -240,7 +240,7 @@ class TestServer < Minitest::Test
   def test_add_hdds
 
     # Read in mock JSON
-    file = File.read('mock-api/add-hdd.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/add-hdd.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -269,7 +269,7 @@ class TestServer < Minitest::Test
   def test_get_hdd
 
     # Read in mock JSON
-    file = File.read('mock-api/get-hdd.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/get-hdd.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -291,7 +291,7 @@ class TestServer < Minitest::Test
   def test_modify_hdd
 
     # Read in mock JSON
-    file = File.read('mock-api/modify-server-hdd.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/modify-server-hdd.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -314,7 +314,7 @@ class TestServer < Minitest::Test
   def test_delete_hdd
 
     # Read in mock JSON
-    file = File.read('mock-api/remove-hdd.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/remove-hdd.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -337,7 +337,7 @@ class TestServer < Minitest::Test
   def test_image
 
     # Read in mock JSON
-    file = File.read('mock-api/get-server-image.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/get-server-image.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -359,7 +359,7 @@ class TestServer < Minitest::Test
   def test_install_image
 
     # Read in mock JSON
-    file = File.read('mock-api/reinstall-image.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/reinstall-image.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -382,7 +382,7 @@ class TestServer < Minitest::Test
   def test_ips
 
     # Read in mock JSON
-    file = File.read('mock-api/list-server-ips.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/list-server-ips.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -404,7 +404,7 @@ class TestServer < Minitest::Test
   def test_add_ip
 
     # Read in mock JSON
-    file = File.read('mock-api/add-server-ip.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/add-server-ip.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -426,7 +426,7 @@ class TestServer < Minitest::Test
   def test_ip
 
     # Read in mock JSON
-    file = File.read('mock-api/get-server-ip.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/get-server-ip.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -448,7 +448,7 @@ class TestServer < Minitest::Test
   def test_release_ip
 
     # Read in mock JSON
-    file = File.read('mock-api/remove-server-ip.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/remove-server-ip.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -471,7 +471,7 @@ class TestServer < Minitest::Test
   def test_add_firewall
 
     # Read in mock JSON
-    file = File.read('mock-api/add-firewall.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/add-firewall.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -496,7 +496,7 @@ class TestServer < Minitest::Test
   def test_firewall
 
     # Read in mock JSON
-    file = File.read('mock-api/get-server-ip-fp.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/get-server-ip-fp.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -516,33 +516,10 @@ class TestServer < Minitest::Test
   end
 
 
-  def test_remove_firewall
-
-    # Read in mock JSON
-    file = File.read('mock-api/remove-ip-fp.json')
-    data = JSON.parse(file)
-
-    # Create stub and perform call
-    Excon.stub({:method => :delete,
-      :path => "/v1/servers/#{data['id']}/ips/IP-ID/firewall_policy"},
-      {:body => JSON.generate(data), :status => 202})
-    
-    response = @server.remove_firewall(server_id: data['id'],
-      ip_id: 'IP-ID')
-
-    # Assertions
-    assert_equal response['state'], 'CONFIGURING'
-
-    # Clear out stubs
-    Excon.stubs.clear 
-
-  end
-
-
   def test_load_balancers
 
     # Read in mock JSON
-    file = File.read('mock-api/list-server-lbs.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/list-server-lbs.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -565,7 +542,7 @@ class TestServer < Minitest::Test
   def test_add_load_balancer
 
     # Read in mock JSON
-    file = File.read('mock-api/add-lb.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/add-lb.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -590,7 +567,7 @@ class TestServer < Minitest::Test
   def test_remove_load_balancer
 
     # Read in mock JSON
-    file = File.read('mock-api/remove-lb.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/remove-lb.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -613,7 +590,7 @@ class TestServer < Minitest::Test
   def test_status
 
     # Read in mock JSON
-    file = File.read('mock-api/get-server-status.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/get-server-status.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -635,7 +612,7 @@ class TestServer < Minitest::Test
   def test_change_status
 
     # Read in mock JSON
-    file = File.read('mock-api/change-server-status.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/change-server-status.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -659,7 +636,7 @@ class TestServer < Minitest::Test
   def test_dvd
 
     # Read in mock JSON
-    file = File.read('mock-api/get-server-dvd.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/get-server-dvd.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -681,7 +658,7 @@ class TestServer < Minitest::Test
   def test_load_dvd
 
     # Read in mock JSON
-    file = File.read('mock-api/load-dvd.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/load-dvd.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -692,7 +669,7 @@ class TestServer < Minitest::Test
     response = @server.load_dvd(server_id: data['id'], dvd_id: 'DVD-ID')
 
     # Assertions
-    assert_equal response['dvd'], nil
+    assert_nil response['dvd']
 
     # Clear out stubs
     Excon.stubs.clear 
@@ -703,7 +680,7 @@ class TestServer < Minitest::Test
   def test_eject_dvd
 
     # Read in mock JSON
-    file = File.read('mock-api/eject-dvd.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/eject-dvd.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -725,7 +702,7 @@ class TestServer < Minitest::Test
   def test_private_networks
 
     # Read in mock JSON
-    file = File.read('mock-api/list-server-pns.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/list-server-pns.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -747,7 +724,7 @@ class TestServer < Minitest::Test
   def test_private_network
 
     # Read in mock JSON
-    file = File.read('mock-api/get-server-pn.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/get-server-pn.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -770,7 +747,7 @@ class TestServer < Minitest::Test
   def test_add_private_network
 
     # Read in mock JSON
-    file = File.read('mock-api/add-pn.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/add-pn.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -782,7 +759,7 @@ class TestServer < Minitest::Test
       private_network_id: 'PRIVATE-NETWORK-ID')
 
     # Assertions
-    assert_equal response['private_networks'], nil
+    assert_nil response['private_networks']
 
     # Clear out stubs
     Excon.stubs.clear
@@ -793,7 +770,7 @@ class TestServer < Minitest::Test
   def test_remove_private_network
 
     # Read in mock JSON
-    file = File.read('mock-api/remove-pn.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/remove-pn.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -816,7 +793,7 @@ class TestServer < Minitest::Test
   def test_create_snapshot
 
     # Read in mock JSON
-    file = File.read('mock-api/create-snapshot.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/create-snapshot.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -838,7 +815,7 @@ class TestServer < Minitest::Test
   def test_snapshot
 
     # Read in mock JSON
-    file = File.read('mock-api/list-snapshots.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/list-snapshots.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -860,7 +837,7 @@ class TestServer < Minitest::Test
   def test_restore_snapshot
 
     # Read in mock JSON
-    file = File.read('mock-api/restore-snapshot.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/restore-snapshot.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -883,7 +860,7 @@ class TestServer < Minitest::Test
   def test_delete_snapshot
 
     # Read in mock JSON
-    file = File.read('mock-api/delete-snapshot.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/delete-snapshot.json')
     data = JSON.parse(file)
 
     # Create stub and perform call
@@ -906,7 +883,7 @@ class TestServer < Minitest::Test
   def test_clone
 
     # Read in mock JSON
-    file = File.read('mock-api/clone-server.json')
+    file = File.read('D:/Repos/oneandone/oneandone-cloudserver-sdk-ruby/test/mock-api/clone-server.json')
     data = JSON.parse(file)
 
     # Create stub and perform call

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 1and1
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tyler Burkhardt (stackpointcloud.com)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -377,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Official 1&1 SDK for Ruby