lib/profitbricks/nic.rb in profitbricks-sdk-ruby-1.0.5 vs lib/profitbricks/nic.rb in profitbricks-sdk-ruby-1.1.0

@@ -1,56 +1,52 @@
 module ProfitBricks
   # NIC class
   class NIC < ProfitBricks::Model
-
     # Delete the NIC.
     def delete
       response = ProfitBricks.request(
         method: :delete,
-        path: "/datacenters/#{self.datacenterId}/servers/#{self.serverId}/nics/#{self.id}",
+        path: "/datacenters/#{datacenterId}/servers/#{serverId}/nics/#{id}",
         expects: 202
       )
       self.requestId = response[:requestId]
       self
     end
 
     # Update the NIC.
     def update(options = {})
       response = ProfitBricks.request(
         method: :patch,
-        path: "/datacenters/#{self.datacenterId}/servers/#{self.serverId}/nics/#{self.id}",
+        path: "/datacenters/#{datacenterId}/servers/#{serverId}/nics/#{id}",
         expects: 202,
         body: options.to_json
       )
-      if response
-        @properties = @properties.merge(response['properties'])
-      end
+      @properties = @properties.merge(response['properties'])
       self
     end
 
     # List all NIC firewall rules
     def list_firewall_rules
-      ProfitBricks::Firewall.list(self.datacenterId, self.serverId, self.id)
+      ProfitBricks::Firewall.list(datacenterId, serverId, id)
     end
 
     # Retrieve NIC firewall rule
     def get_firewall_rule(fwrule_id)
-      ProfitBricks::Firewall.get(self.datacenterId, self.serverId, self.id, fwrule_id)
+      ProfitBricks::Firewall.get(datacenterId, serverId, id, fwrule_id)
     end
 
     # Create NIC firewall rule
     def create_firewall_rule(options = {})
-      ProfitBricks::Firewall.create(self.datacenterId, self.serverId, self.id, options)
-    end 
+      ProfitBricks::Firewall.create(datacenterId, serverId, id, options)
+    end
 
-    alias_method :list_fwrules, :list_firewall_rules
-    alias_method :fwrules, :list_firewall_rules
-    alias_method :get_fwrule, :get_firewall_rule
-    alias_method :fwrule, :get_firewall_rule
-    alias_method :create_fwrule, :create_firewall_rule
+    alias list_fwrules list_firewall_rules
+    alias fwrules list_firewall_rules
+    alias get_fwrule get_firewall_rule
+    alias fwrule get_firewall_rule
+    alias create_fwrule create_firewall_rule
 
     class << self
-
       # Create a new NIC.
       def create(datacenter_id, server_id, options = {})
         response = ProfitBricks.request(
           method: :post,
           path: "/datacenters/#{datacenter_id}/servers/#{server_id}/nics",