leaseweb-rest-api 1.1.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e9018557ac9362a130a25aaa7c2aadc75273d136
-  data.tar.gz: 828f59328828cbc462eb8065372fb369e9483382
+SHA256:
+  metadata.gz: 505edde91242f9a8cca44007236f98d3b118c01d215d79369ca43ebebbdf3660
+  data.tar.gz: 94056e4073bb03f3172e4e74988403b8af18674887d4f984b084f56cbc7b6ffd
 SHA512:
-  metadata.gz: 1cde407ae24825f2a08e869278f8fa73bf9f4832d89b7f744f0bc66c7c7f51fb815d025d68aefa151b2f8873b4aa1d1c272318c1e682fb71fdd1a5eb8e44c145
-  data.tar.gz: b5798e7e9b5b693c19124c694e1b3a517528165112469e155c2d4bb8b25a879a08f9d5591d7fb0d0f3e7c49d35c3957e1e1e51f85a5660355f7377279d85689e
+  metadata.gz: c5ebd3f32db5bd37531e03f311dd9bb18a9d22e9ff64fc87bef86399f9885d1ac40ba704ba56d538613b7a68c41ca47d102f0ab13c1773751942f9fda0bc1bb1
+  data.tar.gz: 1914470197ad5f49fc83a144267d939855bbb951a2c29617477b4b5b2e95ccf38aa536f2c0ee343eba75225029e87acdbbf631c02346a6660e4b91cf300c7a9b

data/.gitignore

@@ -27,9 +27,9 @@ build/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
+.rvmrc

data/.rubocop.yml

@@ -8,4 +8,7 @@ Style/VariableName:
   Enabled: no
 
 Metrics/LineLength:
-  Max: 300
+  Max: 300
+
+Metrics/MethodLength:
+  Max: 20

data/{readme.md → README.md}

@@ -1,9 +1,11 @@
 leaseweb-rest-api
-=====================
+=================
 
 Rubygem to talk to Leaseweb's API
 
-## Installation
+
+Installation
+------------
 
 Add this line to your application's Gemfile:
 
@@ -23,30 +25,18 @@ Or install it yourself:
 $ gem install leaseweb-rest-api
 ```
 
-## Generating a public/private keypair
-
-Make sure you add a strong password to your SSH key!
-
-```
-ssh-keygen -t rsa -b 4096 -C "test@example.com" -f id_rsa
-openssl rsa -in  id_rsa -pubout > id_rsa.pub.pem
-rm id_rsa.pub
-```
-
-Copy the content of id_rsa.pub.pem to the 'Public RSA Key'-field your [SSC API page](https://secure.leaseweb.nl/en/sscApi). Click 'Show API key' for your API key. Keep your id_rsa file private.
 
-## Usage
+Usage
+-----
 
-Start by creating a new instance of the `LeasewebAPI` class, and passing your api key, private key and private key password.
+Start by creating a new instance of the `LeasewebAPI` class, and passing your
+api key, private key and private key password.
 
 ```ruby
-api_key = 'e12b534e-3bf6-4208-89e6-e43798b3c30f'
-privateKeyFile = './id_rsa'
-password = 'my_super_strong_s3cr3t_passw0rd'
+api_key = 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
 
 api = LeasewebAPI.new
 api.apiKeyAuth(api_key)
-api.readPrivateKey(privateKeyFile, password)
 ```
 
 or via oAuth:
@@ -54,19 +44,19 @@ or via oAuth:
 ```ruby
 client_id = 'sadasdasd.asdasdasd.com'
 client_secret = 'a844f7c131a7b63e4129cbcf88352034ef11c86481e0cb2ed3653c07345a113b'
-privateKeyFile = './id_rsa'
-password = 'my_super_strong_s3cr3t_passw0rd'
 
 api = LeasewebAPI.new
 api.getOauthToken(client_id, client_secret)
-api.readPrivateKey(privateKeyFile, password)
 ```
 
-All return values are the direct JSON responses from Leaseweb converted into a Hash.
+All return values are the direct JSON responses from Leaseweb converted into a
+Hash.
 
 See: [documentation](http://developer.leaseweb.com/docs/)
 
-### Managing servers
+
+Managing servers
+----------------
 
 List my baremetal servers:
 
@@ -118,7 +108,9 @@ List all my domains:
 puts api.getDomains
 ```
 
-## Contribute
+
+Contribute
+----------
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/leaseweb-rest-api.gemspec

@@ -1,17 +1,15 @@
 Gem::Specification.new do |s|
   s.name          = 'leaseweb-rest-api'
-  s.version       = '1.1.6'
-  s.authors       = 'Arnoud Vermeer'
-  s.email         = 'a.vermeer@tech.leaseweb.com'
-  s.license       = 'Apache'
+  s.version       = '2.0.0'
+  s.date          = '2020-04-01'
+  s.authors       = 'Leaseweb Product Owners'
+  s.email         = 'productowners@leaseweb.com'
+  s.license       = 'Apache-2.0'
   s.summary       = 'Leaseweb REST API client for Ruby'
   s.description   = 'Leaseweb REST API client for Ruby.'
   s.homepage      = 'https://github.com/LeaseWeb/leaseweb-rest-api'
 
   s.files         = `git ls-files`.split("\n")
 
-  s.add_dependency 'httparty'
-
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'webmock'
+  s.add_runtime_dependency 'httparty', '~> 0.18.0'
 end

data/lib/leaseweb-rest-api.rb

@@ -1,10 +1,9 @@
-#!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'httparty'
 require 'base64'
 require 'time'
 require 'json'
-require_relative 'hash-to-uri-conversion'
 
 class LeasewebAPI
   include HTTParty
@@ -14,86 +13,40 @@ class LeasewebAPI
   base_uri 'https://api.leaseweb.com'
 
   def initialize
-    @tmpdir = "/tmp/lsw-rest-api"
+    @tmpdir = '/tmp/lsw-rest-api'
     Dir.mkdir(@tmpdir) unless Dir.exist?(@tmpdir)
   end
 
   def apiKeyAuth(apikey)
-    @options = { headers: { 'X-Lsw-Auth' => apikey, 'Content-Type' => 'application/json' } }
+    @options = {
+      headers: {
+        'X-Lsw-Auth' => apikey,
+        'Content-Type' => 'application/json'
+      }
+    }
   end
 
   def getOauthToken(client_id, client_secret)
     access_token = validate_token(client_id)
 
-    if (access_token == false)
+    if access_token == false
       response = self.class.post('https://auth.leaseweb.com/token', basic_auth: { username: client_id, password: client_secret }, body: { grant_type: 'client_credentials' })
       access_token = response.parsed_response['access_token']
       cache_token(client_id, access_token, response.parsed_response['expires_in'])
     end
 
-    @options = { headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' } }
-  end
-
-  def getPasswordToken(username, password, client_id, client_secret)
-    access_token = validate_token(client_id)
-
-    if (access_token == false)
-      response = self.class.post('https://auth.leaseweb.com/token', basic_auth: { username: client_id, password: client_secret }, body: { grant_type: 'password', username: username, password: password })
-      access_token = response.parsed_response['access_token']
-      cache_token(client_id, access_token, response.parsed_response['expires_in'])
-    end
-
-    @options = { headers: { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => 'application/json' } }
-  end
-
-  def validate_token(client_id)
-    begin
-      file = "#{@tmpdir}/#{client_id}.json"
-      content = JSON.parse(File.read(file))
-      expires_at = DateTime.parse(content['expires_at'])
-
-      if expires_at > DateTime.now
-        return content['access_token']
-      else
-        File.delete(file)
-      end
-    rescue
-      return false
-    end
-
-    return false
-  end
-
-  def cache_token(client_id, access_token, expires_in)
-    file = "#{@tmpdir}/#{client_id}.json"
-    content = { access_token: access_token, expires_at: Time.now.getutc + expires_in }.to_json
-    File.write(file, content)
-  end
-
-  def readPrivateKey(privateKey, password)
-    @private_key = OpenSSL::PKey::RSA.new(File.read(privateKey), password)
+    @options = {
+      headers: {
+        'Authorization' => "Bearer #{access_token}",
+        'Content-Type' => 'application/json'
+      }
+    }
   end
 
   def get(url)
     self.class.get(url, @options)
   end
 
-  def get_paginated(url, key, offset = 0, limit = 50)
-    data = []
-
-    loop do
-      response = self.class.get("#{url}&offset=#{offset}&limit=#{limit}", @options)
-      total = response.parsed_response['_metadata']['totalCount']
-
-      data += response.parsed_response[key]
-
-      offset += limit
-      break unless offset < total
-    end
-
-    data
-  end
-
   def post(url, body)
     opt = @options.merge!(body: body)
     self.class.post(url, opt)
@@ -108,283 +61,240 @@ class LeasewebAPI
     self.class.delete(url, @options)
   end
 
-  # Domains
-  def getDomains
-    self.class.get('/v1/domains', @options)
-  end
-
-  def getDomain(domain)
-    self.class.get("/v1/domains/#{domain}", @options)
-  end
-
-  def updateDomain(domain, ttl)
-    opt = @options.merge!(body: { ttl: ttl })
-
-    self.class.put("/v1/domains/#{domain}", opt)
-  end
-
-  def getDNSRecords(domain)
-    self.class.get("/v1/domains/#{domain}/dnsRecords", @options)
-  end
+  def get_paginated(url, key, offset = 0, limit = 50)
+    data = []
 
-  def createDNSRecords(domain, host, content, type, priority = nil)
-    opt = @options.merge!(body: { host: host, content: content, type: type })
+    loop do
+      response = self.class.get("#{url}&offset=#{offset}&limit=#{limit}", @options)
+      total = response.parsed_response['_metadata']['totalCount']
+      data += response.parsed_response[key]
+      offset += limit
 
-    if !priority.nil? && ((type == 'MX') || (type == 'SRV'))
-      opt[:body][:priority] = priority
+      break unless offset < total
     end
 
-    self.class.post("/v1/domains/#{domain}/dnsRecords", opt)
-  end
-
-  def getDNSRecord(domain, dnsRecordId)
-    self.class.get("/v1/domains/#{domain}/dnsRecords/#{dnsRecordId}", @options)
+    data
   end
 
-  def updateDNSRecord(domain, dnsRecordId, host, content, type, priority = nil)
-    opt = @options.merge!(body: { id: dnsRecordId, host: host, content: content, type: type })
-
-    if !priority.nil? && ((type == 'MX') || (type == 'SRV'))
-      opt[:body][:priority] = priority
-    end
-
-    self.class.put("/v1/domains/#{domain}/dnsRecords/#{dnsRecordId}", opt)
+  def rebootDedicatedServer(server_id)
+    self.class.post("/bareMetals/v2/servers/#{server_id}/powerCycle", @options)
   end
 
-  def deleteDNSRecord(domain, dnsRecordId)
-    self.class.delete("/v1/domains/#{domain}/dnsRecords/#{dnsRecordId}", @options)
+  def powerOnDedicatedServer(server_id)
+    self.class.post("/bareMetals/v2/servers/#{server_id}/powerOn", @options)
   end
 
-  # Rescue
-  def getRescueImages
-    self.class.get('/v1/rescueImages', @options)
-  end
+  def launchRescueModeDedicatedServer(server_id, rescue_image_id, ssh_key)
+    self.class.post("/bareMetals/v2/servers/#{server_id}/cancelActiveJob", @options)
 
-  # BareMetals
-  def getBareMetals
-    self.class.get('/v1/bareMetals', @options)
-  end
+    opt = @options.merge!(body: { rescueImageId: rescue_image_id, sshKeys: ssh_key, powerCycle: true }.to_json)
 
-  def getBareMetal(bareMetalId)
-    self.class.get("/v1/bareMetals/#{bareMetalId}", @options)
+    self.class.post("/bareMetals/v2/servers/#{server_id}/rescueMode", opt)
   end
 
-  def updateBareMetal(bareMetalId, reference)
-    opt = @options.merge!(body: { reference: reference })
+  def getDedicatedServers(result = nil)
+    partialSize = (result && result['servers'] && result['servers'].size) || 0
+    partialResult = self.class.get("/bareMetals/v2/servers?offset=#{partialSize}&limit=50", @options)
 
-    self.class.put("/v1/bareMetals/#{bareMetalId}", opt)
-  end
+    return partialResult if partialResult['errorMessage']
 
-  def getSwitchPort(bareMetalId)
-    self.class.get("/v1/bareMetals/#{bareMetalId}/switchPort", @options)
-  end
+    if result.nil?
+      result = partialResult
+    else
+      result['servers'] += partialResult['servers']
+      result['_metadata']['offset'] = 0
+      result['_metadata']['limit'] = partialResult['_metadata']['totalCount']
+    end
 
-  def postSwitchPortOpen(bareMetalId)
-    self.class.post("/v1/bareMetals/#{bareMetalId}/switchPort/open", @options)
-  end
+    return getDedicatedServers(result) if result['servers'].size < partialResult['_metadata']['totalCount']
 
-  def postSwitchPortClose(bareMetalId)
-    self.class.post("/v1/bareMetals/#{bareMetalId}/switchPort/close", @options)
+    result
   end
 
-  def getPowerStatus(bareMetalId)
-    self.class.get("/v1/bareMetals/#{bareMetalId}/powerStatus", @options)
+  def getDedicatedServerByIp(ip)
+    self.class.get("/internal/dedicatedserverapi/v2/servers?ip=#{ip}", @options)
   end
 
-  def getIPs(bareMetalId)
-    self.class.get("/v1/bareMetals/#{bareMetalId}/ips", @options)
+  def getDedicatedServer(server_id)
+    self.class.get("/bareMetals/v2/servers/#{server_id}", @options)
   end
 
-  def getIP(bareMetalId, ipAddress)
-    self.class.get("/v1/bareMetals/#{bareMetalId}/ips/#{ipAddress}", @options)
+  def getDedicatedServerHardware(server_id)
+    self.class.get("/bareMetals/v2/servers/#{server_id}/hardwareInfo", @options)
   end
 
-  def updateIP(bareMetalId, ipAddress, reverseLookup = '', nullRouted = 0)
-    opt = @options.merge!(body: { reverseLookup: reverseLookup, nullRouted: nullRouted })
-
-    self.class.put("/v1/bareMetals/#{bareMetalId}/ips/#{ipAddress}", opt)
+  def getDedicatedServerDhcpReservation(server_id)
+    result = self.class.get("/bareMetals/v2/servers/#{server_id}/leases", @options)
+    result['leases'].pop
   end
 
-  def getIpmiCredentials(bareMetalId)
-    self.class.get("/v1/bareMetals/#{bareMetalId}/ipmiCredentials", @options)
+  def createDedicatedServerDhcpReservation(server_id, boot_file_name)
+    opt = @options.merge!(body: { bootFileName: boot_file_name }.to_json)
+    self.class.post("/bareMetals/v2/servers/#{server_id}/leases", opt)
   end
 
-  def getNetworkUsage(bareMetalId)
-    self.class.get("/v1/bareMetals/#{bareMetalId}/networkUsage", @options)
+  def removeDedicatedServerDhcpReservation(server_id)
+    self.class.delete("/bareMetals/v2/servers/#{server_id}/leases", @options)
   end
 
-  def getNetworkUsageBandWidth(bareMetalId, dateFrom, dateTo, format = 'json')
-    self.class.get("/v1/bareMetals/#{bareMetalId}/networkUsage/bandWidth", formatRequest(dateFrom, dateTo, format))
+  def powerOnVirtualServer(server_id)
+    self.class.post("/cloud/v2/virtualServers/#{server_id}/powerOn", @options)
   end
 
-  def getNetworkUsageDataTraffic(bareMetalId, dateFrom, dateTo, format = 'json')
-    self.class.get("/v1/bareMetals/#{bareMetalId}/networkUsage/dataTraffic", formatRequest(dateFrom, dateTo, format))
+  def powerOffVirtualServer(server_id)
+    self.class.post("/cloud/v2/virtualServers/#{server_id}/powerOff", @options)
   end
 
-  def postReboot(bareMetalId)
-    self.class.post("/v1/bareMetals/#{bareMetalId}/reboot", @options)
+  def rebootVirtualServer(server_id)
+    self.class.post("/cloud/v2/virtualServers/#{server_id}/reboot", @options)
   end
 
-  def installServer(bareMetalId, osId, hdd = [])
-    opt = @options.merge!(body: { osId: osId, hdd: hdd }, query_string_normalizer: ->(h) { HashToURIConversion.new.to_params(h) })
-
-    self.class.post("/v1/bareMetals/#{bareMetalId}/install", opt)
-  end
-
-  def postResqueMode(bareMetalId, osId)
-    opt = @options.merge!(body: { osId: osId })
-
-    self.class.post("/v1/bareMetals/#{bareMetalId}/rescueMode", opt)
+  def reinstallVirtualServer(server_id)
+    self.class.post("/cloud/v2/virtualServers/#{server_id}/reinstall", @options)
   end
 
-  def getRootPassword(bareMetalId, format = 'json')
-    opt = @options.merge!(headers: formatHeader(format))
-
-    self.class.get("/v1/bareMetals/#{bareMetalId}/rootPassword", opt)
-  end
+  def getVirtualServers(result = nil)
+    partialSize = (result && result['virtualServers'] && result['virtualServers'].size) || 0
+    partialResult = self.class.get("/cloud/v2/virtualServers?offset=#{partialSize}&limit=50", @options)
 
-  def getInstallationStatus(bareMetalId)
-    response = self.class.get("/v1/bareMetals/#{bareMetalId}/installationStatus", @options)
+    return partialResult if partialResult['errorMessage']
 
-    if response['installationStatus'].include?('initRootPassword')
-      response['installationStatus']['initRootPassword'] = decrypt(response['installationStatus']['initRootPassword'])
+    if result.nil?
+      result = partialResult
+    else
+      result['virtualServers'] += partialResult['virtualServers']
+      result['_metadata']['offset'] = 0
+      result['_metadata']['limit'] = partialResult['_metadata']['totalCount']
     end
 
-    if response['installationStatus'].include?('rescueModeRootPass')
-      response['installationStatus']['rescueModeRootPass'] = decrypt(response['installationStatus']['rescueModeRootPass'])
-    end
+    return getVirtualServers(result) if result['virtualServers'].size < partialResult['_metadata']['totalCount']
 
-    response
+    result
   end
 
-  def getLeases(bareMetalId)
-    self.class.get("/v1/bareMetals/#{bareMetalId}/leases", @options)
+  def getVirtualServer(server_id)
+    self.class.get("/cloud/v2/virtualServers/#{server_id}", @options)
   end
 
-  def setLease(bareMetalId, bootFileName)
-    opt = @options.merge!(body: { bootFileName: bootFileName })
+  def getVirtualServerControlPanelCredentials(server_id)
+    self.class.get("/cloud/v2/virtualServers/#{server_id}/credentials/CONTROL_PANEL", @options)
+  end
 
-    self.class.post("/v1/bareMetals/#{bareMetalId}/leases", opt)
+  def getVirtualServerControlPanelCredentialsForUser(server_id, username)
+    self.class.get("/cloud/v2/virtualServers/#{server_id}/credentials/CONTROL_PANEL/#{username}", @options)
   end
 
-  def getLease(bareMetalId, macAddress)
-    self.class.get("/v1/bareMetals/#{bareMetalId}/leases/#{macAddress}", @options)
+  def getVirtualServerOsCredentials(server_id)
+    self.class.get("/cloud/v2/virtualServers/#{server_id}/credentials/OPERATING_SYSTEM", @options)
   end
 
-  def deleteLease(bareMetalId, macAddress)
-    self.class.delete("/v1/bareMetals/#{bareMetalId}/leases/#{macAddress}", @options)
+  def getVirtualServerOsCredentialsForUser(server_id, username)
+    self.class.get("/cloud/v2/virtualServers/#{server_id}/credentials/OPERATING_SYSTEM/#{username}", @options)
   end
 
   # Private Networks
   def getPrivateNetworks
-    self.class.get('/v1/privateNetworks', @options)
+    self.class.get('/bareMetals/v2/privateNetworks', @options)
   end
 
   # TODO: check post with name
   def createPrivateNetworks(name = '')
-    opt = @options.merge!(body: { name: name })
+    opt = @options.merge!(body: { name: name }.to_json)
 
-    self.class.post('/v1/privateNetworks', opt)
+    self.class.post('/bareMetals/v2/privateNetworks', opt)
   end
 
   def getPrivateNetwork(id)
-    self.class.get("/v1/privateNetworks/#{id}", @options)
+    self.class.get("/bareMetals/v2/privateNetworks/#{id}", @options)
   end
 
   # TODO: Check with Jeroen if it works
   def updatePrivateNetwork(id, name = '')
-    opt = @options.merge!(body: { name: name })
+    opt = @options.merge!(body: { name: name }.to_json)
 
-    self.class.put("/v1/privateNetworks/#{id}", opt)
+    self.class.put("/bareMetals/v2/privateNetworks/#{id}", opt)
   end
 
   def deletePrivateNetwork(id)
-    self.class.delete("/v1/privateNetworks/#{id}", @options)
+    self.class.delete("/bareMetals/v2/privateNetworks/#{id}", @options)
   end
 
-  def createPrivateNetworksBareMetals(id, bareMetalId)
-    opt = @options.merge!(body: { bareMetalId: bareMetalId })
+  def addDedicatedServerToPrivateNetwork(id, server_id)
+    opt = @options.merge!(body: { serverId: server_id }.to_json)
 
-    self.class.post("/v1/privateNetworks/#{id}/bareMetals", opt)
+    self.class.post("/bareMetals/v2/privateNetworks/#{id}/servers", opt)
   end
 
-  def deletePrivateNetworksBareMetals(id, bareMetalId)
-    self.class.delete("/v1/privateNetworks/#{id}/bareMetals/#{bareMetalId}", @options)
+  def removeDedicatedServerFromPrivateNetwork(id, server_id)
+    self.class.delete("/bareMetals/v2/privateNetworks/#{id}/servers/#{server_id}", @options)
   end
 
   # Operating Systems
   def getOperatingSystems
-    self.class.get('/v1/operatingSystems', @options)
+    self.class.get('/bareMetals/v2/operatingSystems', @options)
   end
 
-  def getOperatingSystem(operatingSystemId)
-    self.class.get("/v1/operatingSystems/#{operatingSystemId}", @options)
+  def getOperatingSystem(operating_system_id)
+    self.class.get("/bareMetals/v2/operatingSystems/#{operating_system_id}", @options)
   end
 
-  def getControlPanels(operatingSystemId)
-    self.class.get("/v1/operatingSystems/#{operatingSystemId}/controlPanels", @options)
+  def getControlPanels(operating_system_id)
+    self.class.get("/bareMetals/v2/operatingSystems/#{operating_system_id}/controlPanels", @options)
   end
 
-  def getControlPanel(operatingSystemId, controlPanelId)
-    self.class.get("/v1/operatingSystems/#{operatingSystemId}/controlPanels/#{controlPanelId}", @options)
-  end
-
-  def getPartitionSchema(operatingSystemId, bareMetalId)
-    opt = @options.merge!(query: { serverPackId: bareMetalId })
-
-    self.class.get("/v1/operatingSystems/#{operatingSystemId}/partitionSchema", opt)
+  def getControlPanel(operating_system_id, control_panel_id)
+    self.class.get("/bareMetals/v2/operatingSystems/#{operating_system_id}/controlPanels/#{control_panel_id}", @options)
   end
 
   # IPs
   def getIps
-    self.class.get('/v1/ips', @options)
+    self.class.get('/ipMgmt/v2/ips', @options)
   end
 
-  def getIp(ipAddress)
-    self.class.get("/v1/ips/#{ipAddress}", @options)
+  def getIp(ip)
+    self.class.get("/ipMgmt/v2/ips/#{ip}", @options)
   end
 
-  def updateIp(ipAddress, reverseLookup = '', nullRouted = 0)
-    opt = @options.merge!(body: { reverseLookup: reverseLookup, nullRouted: nullRouted })
+  def updateIp(ip, reverse_lookup = '', null_routed = 0)
+    opt = @options.merge!(body: { reverseLookup: reverse_lookup, nullRouted: null_routed }.to_json)
 
-    self.class.put("/v1/ips/#{ipAddress}", opt)
+    self.class.put("/ipMgmt/v2/ips/#{ip}", opt)
   end
 
-  # Pay as you go
-  def getPAYGInstances
-    self.class.get('/v1/payAsYouGo/bareMetals/instances', @options)
+  def getDedicatedServerBandwidthMetrics(server_id, date_from, date_to, format = 'json')
+    self.class.get("/bareMetals/v2/servers/#{server_id}/metrics/bandwidth", formatRequest(date_from, date_to, 'AVG', format))
   end
 
-  def createPAYGInstance(modelId)
-    opt = @options.merge!(model: modelId)
-
-    self.class.post('/v1/payAsYouGo/bareMetals/instances', opt)
+  def getDedicatedServerDatatrafficMetrics(server_id, date_from, date_to, format = 'json')
+    self.class.get("/bareMetals/v2/servers/#{server_id}/metrics/datatraffic", formatRequest(date_from, date_to, 'SUM', format))
   end
 
-  def getPAYGInstance(bareMetalId)
-    self.class.get("/v1/payAsYouGo/bareMetals/instances/#{bareMetalId}", @options)
-  end
+  protected
 
-  def destroyPAYGInstance(bareMetalId)
-    self.class.post("/v1/payAsYouGo/bareMetals/instances/#{bareMetalId}/destroy", @options)
-  end
+  def validate_token(client_id)
+    begin
+      file = "#{@tmpdir}/#{client_id}.json"
+      content = JSON.parse(File.read(file))
+      expires_at = DateTime.parse(content['expires_at'])
 
-  def getPAYGModels
-    self.class.get('/v1/payAsYouGo/bareMetals/models', @options)
-  end
+      return content['access_token'] if expires_at > DateTime.now
 
-  def getPAYGModelInstance(modelId)
-    self.class.get("/v1/payAsYouGo/bareMetals/models/#{modelId}", @options)
-  end
+      File.delete(file)
+    rescue
+      return false
+    end
 
-  protected
+    false
+  end
 
-  def decrypt(string)
-    @private_key.private_decrypt(Base64.decode64(string))
+  def cache_token(client_id, access_token, expires_in)
+    file = "#{@tmpdir}/#{client_id}.json"
+    content = { access_token: access_token, expires_at: Time.now.getutc + expires_in }.to_json
+    File.write(file, content)
   end
 
   def dateFormat(date)
-    Date.parse(date).strftime('%d-%m-%Y')
+    Date.parse(date).strftime('%Y-%m-%dT00:00:00Z')
   end
 
   def formatHeader(format)
@@ -393,11 +303,10 @@ class LeasewebAPI
              else
                { 'Accept' => 'image/png' }.merge!(@options[:headers])
              end
-
     header
   end
 
-  def formatRequest(dateFrom, dateTo, format)
-    @options.merge!(query: { dateFrom: dateFormat(dateFrom), dateTo: dateFormat(dateTo) }, headers: formatHeader(format))
+  def formatRequest(date_from, date_to, aggregation, format)
+    @options.merge!(query: { from: dateFormat(date_from), to: dateFormat(date_to), aggregation: aggregation, granularity: 'DAY' }, headers: formatHeader(format))
   end
 end