Networking L3: Mapping external fixed IPs

Author: haphan

src/Networking/v2/Extensions/Layer3/Models/FixedIp.php

@@ -13,6 +13,7 @@ class FixedIp extends AbstractResource
     public $ip;
 
     protected $aliases = [
-        'subnet_id' => 'subnetId',
+        'subnet_id'  => 'subnetId',
+        'ip_address' => 'ip',
     ];
 }

src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php

@@ -74,4 +74,9 @@ public function retrieve()
         $response = $this->executeWithState($this->api->getFloatingIp());
         $this->populateFromResponse($response);
     }
+
+    public function associatePort(string $portId)
+    {
+        $this->execute($this->api->putFloatingIp(), ['id' => $this->id, 'portId' => $portId]);
+    }
 }

src/Networking/v2/Extensions/Layer3/Models/GatewayInfo.php

@@ -13,7 +13,7 @@ class GatewayInfo extends AbstractResource
     /** @var string */
     public $enableSnat;
 
-    /** @var []FixedIp */
+    /** @var FixedIp[] */
     public $fixedIps;
 
     protected $aliases = [
@@ -27,7 +27,7 @@ class GatewayInfo extends AbstractResource
     protected function getAliases(): array
     {
         return parent::getAliases() + [
-            'fixed_ips' => new Alias('fixedIps', FixedIp::class, true),
+            'external_fixed_ips' => new Alias('fixedIps', FixedIp::class, true),
         ];
     }
 }

tests/unit/Networking/v2/Extensions/Layer3/Fixtures/Router.resp

@@ -3,21 +3,44 @@ Content-Type: application/json
 
 {
     "router": {
-        "status": "ACTIVE",
+        "admin_state_up": true,
+        "availability_zone_hints": [],
+        "availability_zones": [
+            "nova"
+        ],
+        "created_at": "2018-03-19T19:17:04Z",
+        "description": "",
+        "distributed": false,
         "external_gateway_info": {
-            "network_id": "85d76829-6415-48ff-9c63-5c5ca8c61ac6",
             "enable_snat": true,
             "external_fixed_ips": [
                 {
-                    "subnet_id": "255.255.255.0",
-                    "ip": "192.168.10.2"
+                    "ip_address": "172.24.4.6",
+                    "subnet_id": "b930d7f6-ceb7-40a0-8b81-a425dd994ccf"
+                },
+                {
+                    "ip_address": "2001:db8::9",
+                    "subnet_id": "0c56df5d-ace5-46c8-8f4c-45fa4e334d18"
                 }
-            ]
+            ],
+            "network_id": "ae34051f-aa6c-4c75-abf5-50dc9ac99ef3"
         },
+        "flavor_id": "f7b14d9a-b0dc-4fbe-bb14-a0f4970a69e0",
+        "ha": false,
+        "id": "f8a44de0-fc8e-45df-93c7-f79bf3b01c95",
         "name": "router1",
-        "admin_state_up": true,
-        "tenant_id": "d6554fe62e2f41efbb6e026fad5c1542",
-        "routes": [],
-        "id": "a07eea83-7710-4860-931b-5fe220fae533"
+        "revision_number": 1,
+        "routes": [
+            {
+                "destination": "179.24.1.0/24",
+                "nexthop": "172.24.3.99"
+            }
+        ],
+        "status": "ACTIVE",
+        "updated_at": "2018-03-19T19:17:22Z",
+        "project_id": "0bd18306d801447bb457a46252d82d13",
+        "tenant_id": "0bd18306d801447bb457a46252d82d13",
+        "service_type_id": null,
+        "tags": ["tag1,tag2"]
     }
-}
+}

tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php

@@ -69,6 +69,9 @@ public function test_it_retrieves()
         $this->setupMock('GET', 'v2.0/routers/id', null, [], 'Router');
 
         $this->router->retrieve();
+
+        $this->assertEquals('f8a44de0-fc8e-45df-93c7-f79bf3b01c95', $this->router->id);
+        $this->assertCount(2, $this->router->externalGatewayInfo->fixedIps);
     }
 
     public function test_it_adds_interface()