Merge pull request #46 from ukfast/master

Merge in UKFast Master

Author: ptmcnally

src/eCloud/Client.php

@@ -84,6 +84,14 @@ public function iops()
         return (new IopsClient($this->httpClient))->auth($this->token);
     }
 
+    /**
+     * @return BaseClient
+     */
+    public function ipAddresses()
+    {
+        return (new IpAddressesClient($this->httpClient))->auth($this->token);
+    }
+
     /**
      * @return BaseClient
      */
@@ -92,7 +100,6 @@ public function appliances()
         return (new ApplianceClient($this->httpClient))->auth($this->token);
     }
 
-
     /**
      * eCloud v2
      */
@@ -313,14 +320,6 @@ public function loadBalancerSpecs()
         return (new LoadBalancerSpecClient($this->httpClient))->auth($this->token);
     }
 
-    /**
-     * @return BaseClient
-     */
-    public function loadBalancerNetworks()
-    {
-        return (new LoadBalancerNetworkClient($this->httpClient))->auth($this->token);
-    }
-
     /**
      * @return BaseClient
      */

src/eCloud/Entities/LoadBalancerNetwork.php renamed to src/eCloud/Entities/IpAddress.php

@@ -7,13 +7,12 @@
 /**
  * @property string $id
  * @property string $name
- * @property string $loadBalancerId
+ * @property string $ipAddress
  * @property string $networkId
- * @property string $sync
  * @property string $createdAt
  * @property string $updatedAt
  */
-class LoadBalancerNetwork extends Entity
+class IpAddress extends Entity
 {
     protected $dates = ['createdAt', 'updatedAt'];
 }

src/eCloud/Entities/LoadBalancer.php

@@ -9,6 +9,7 @@
  * @property string $name
  * @property string $vpcId
  * @property string $availabilityZoneId
+ * @property string $networkId
  * @property string $specId
  * @property int $configId
  * @property string $sync

src/eCloud/Entities/Vip.php

@@ -7,7 +7,7 @@
 /**
  * @property string $id
  * @property string $name
- * @property string $loadBalancerNetworkId
+ * @property string $loadBalancerId
  * @property string $ipAddressId
  * @property integer $configId
  * @property string $sync

src/eCloud/LoadBalancerNetworkClient.php renamed to src/eCloud/IpAddressesClient.php

@@ -3,39 +3,32 @@
 namespace UKFast\SDK\eCloud;
 
 use UKFast\SDK\Entities\ClientEntityInterface;
+
+use UKFast\SDK\eCloud\Entities\IpAddress;
 use UKFast\SDK\Traits\PageItems;
-use UKFast\SDK\eCloud\Entities\LoadBalancerNetwork;
 
-class LoadBalancerNetworkClient extends Client implements ClientEntityInterface
+class IpAddressesClient extends Client implements ClientEntityInterface
 {
     use PageItems;
 
-    protected $collectionPath = 'v2/load-balancer-networks';
+    private $collectionPath = "v2/ip-addresses";
 
     public function getEntityMap()
     {
         return [
             'id' => 'id',
             'name' => 'name',
-            'load_balancer_id' => 'loadBalancerId',
+            'ip_address' => 'ipAddress',
             'network_id' => 'networkId',
-            'sync' => 'sync',
             'created_at' => 'createdAt',
             'updated_at' => 'updatedAt',
         ];
     }
 
     public function loadEntity($data)
     {
-        return new LoadBalancerNetwork(
+        return new IpAddress(
             $this->apiToFriendly($data, $this->getEntityMap())
         );
     }
-
-    public function getAllByLoadBalancerId($id)
-    {
-        return $this->getAll([
-            'load_balancer_id' => $id
-        ]);
-    }
 }

src/eCloud/LoadBalancerClient.php

@@ -19,6 +19,7 @@ public function getEntityMap()
             'name' => 'name',
             'vpc_id' => 'vpcId',
             'availability_zone_id' => 'availabilityZoneId',
+            'network_id' => 'networkId',
             'load_balancer_spec_id' => 'specId',
             'config_id' => 'configId',
             'sync' => 'sync',
@@ -33,9 +34,4 @@ public function loadEntity($data)
             $this->apiToFriendly($data, $this->getEntityMap())
         );
     }
-
-    public function getNetworks($id)
-    {
-        return $this->loadBalancerNetworks()->getAllByLoadBalancerId($id);
-    }
 }

src/eCloud/VipClient.php

@@ -17,7 +17,7 @@ public function getEntityMap()
         return [
             'id' => 'id',
             'name' => 'name',
-            'load_balancer_network_id' => 'loadBalancerNetworkId',
+            'load_balancer_id' => 'loadBalancerId',
             'ip_address_id' => 'ipAddressId',
             'config_id' => 'configId',
             'sync' => 'sync',