Merge pull request #48 from ukfast/master

Merge in UKFast master

Author: ptmcnally

src/Loadbalancers/CertClient.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace UKFast\SDK\Loadbalancers;
+
+use UKFast\SDK\Client as BaseClient;
+use UKFast\SDK\Loadbalancers\Entities\Cert;
+
+class CertClient extends BaseClient
+{
+    protected $basePath = 'loadbalancers/';
+
+    const MAP = [
+        'listener_id' => 'listenerId',
+        'created_at' => 'createdAt',
+        'updated_at' => 'updatedAt',
+        'expires_at' => 'expiresAt',
+        'ca_bundle' => 'caBundle',
+    ];
+
+    /**
+     * Gets a paginated response of all Certs
+     *
+     * @param int $page
+     * @param int $perPage
+     * @param array $filters
+     * @return \UKFast\SDK\Page
+     */
+    public function getPage($page = 1, $perPage = 15, $filters = [])
+    {
+        $filters = $this->friendlyToApi($filters, self::MAP);
+        $page = $this->paginatedRequest('v2/certs', $page, $perPage, $filters);
+        $page->serializeWith(function ($item) {
+            return $this->serializeCert($item);
+        });
+
+        return $page;
+    }
+
+    /**
+     * @return \UKFast\SDK\Loadbalancers\Entities\Cert
+     */
+    public function serializeCert($raw)
+    {
+        return new Cert($this->apiToFriendly($raw, self::MAP));
+    }
+}

src/Loadbalancers/Client.php

@@ -37,6 +37,11 @@ public function vips()
     {
         return (new VipClient($this->httpClient))->auth($this->token);
     }
+    
+    public function certs()
+    {
+        return (new CertClient($this->httpClient))->auth($this->token);
+    }
 
     public function accessIps()
     {

src/Loadbalancers/ListenerClient.php

@@ -40,7 +40,8 @@ class ListenerClient extends BaseClient implements ClientEntityInterface
 
     const CERT_MAP = [
         'frontend_id' => 'frontendId',
-        'ca_bundle' => 'caBundle'
+        'ca_bundle' => 'caBundle',
+        'expires_at' => 'expiresAt',
     ];
 
 

src/eCloud/Client.php

@@ -328,14 +328,6 @@ public function loadBalancers()
         return (new LoadBalancerClient($this->httpClient))->auth($this->token);
     }
 
-    /**
-     * @return BaseClient
-     */
-    public function monitorings()
-    {
-        return (new MonitoringClient($this->httpClient))->auth($this->token);
-    }
-
     /**
      * @return BaseClient
      */

src/eCloud/Entities/FloatingIp.php

@@ -9,11 +9,23 @@
  * @property string $vpcId
  * @property string $availabilityZoneId
  * @property string $ipAddress
+ * @property string $rdnsHostname
  * @property string $resourceId
  * @property string $createdAt
  * @property string $updatedAt
  */
 class FloatingIp extends Entity
 {
     protected $dates = ['createdAt', 'updatedAt'];
+
+    public static $entityMap = [
+        'id' => 'id',
+        'vpc_id' => 'vpcId',
+        'availability_zone_id' => 'availabilityZoneId',
+        'ip_address' => 'ipAddress',
+        'rdns_hostname' => 'rdnsHostname',
+        'resource_id' => 'resourceId',
+        'created_at' => 'createdAt',
+        'updated_at' => 'updatedAt',
+    ];
 }

src/eCloud/FloatingIpClient.php

@@ -14,15 +14,7 @@ class FloatingIpClient extends Client implements ClientEntityInterface
 
     public function getEntityMap()
     {
-        return [
-            'id' => 'id',
-            'vpc_id' => 'vpcId',
-            'availability_zone_id' => 'availabilityZoneId',
-            'ip_address' => 'ipAddress',
-            'resource_id' => 'resourceId',
-            'created_at' => 'createdAt',
-            'updated_at' => 'updatedAt',
-        ];
+        return FloatingIp::$entityMap;
     }
 
     public function loadEntity($data)