diff --git a/src/Networking/v2/Models/Network.php b/src/Networking/v2/Models/Network.php index 89c0b9a4..b8e48545 100644 --- a/src/Networking/v2/Models/Network.php +++ b/src/Networking/v2/Models/Network.php @@ -39,9 +39,17 @@ class Network extends OperatorResource implements Listable, Retrievable, Creatab /** @var string */ public $tenantId; + /** @var bool */ + public $routerExternal; + + /** @var string */ + public $providerNetworkType; + protected $aliases = [ - 'admin_state_up' => 'adminStateUp', - 'tenant_id' => 'tenantId', + 'admin_state_up' => 'adminStateUp', + 'tenant_id' => 'tenantId', + 'router:external' => 'routerExternal', + 'provider:network_type' => 'providerNetworkType', ]; protected $resourceKey = 'network'; diff --git a/tests/unit/Networking/v2/Fixtures/network-get.resp b/tests/unit/Networking/v2/Fixtures/network-get.resp index a6d0b97c..4c4b39a4 100644 --- a/tests/unit/Networking/v2/Fixtures/network-get.resp +++ b/tests/unit/Networking/v2/Fixtures/network-get.resp @@ -5,12 +5,18 @@ Content-Type: application/json "network": { "status": "ACTIVE", "subnets": [ - "subnetId" + "54d6f61d-db07-451c-9ab3-b9609b6b6f0b" ], "name": "fakenetwork", - "tenant_id": "openstack", - "admin_state_up": true, + "router:external": true, + "admin_state_up": false, + "tenant_id": "4fd44f30292945e481c7b8a0c8908869", + "qos_policy_id": "6a8454ade84346f59e8d40665f878b2e", + "created_at": "2016-03-08T20:19:41", + "mtu": 0, "shared": true, + "port_security_enabled": true, + "updated_at": "2016-03-08T20:19:41", "id": "networkId" } } diff --git a/tests/unit/Networking/v2/Models/NetworkTest.php b/tests/unit/Networking/v2/Models/NetworkTest.php index 629bfa41..d9c7b07f 100644 --- a/tests/unit/Networking/v2/Models/NetworkTest.php +++ b/tests/unit/Networking/v2/Models/NetworkTest.php @@ -9,6 +9,7 @@ class NetworkTest extends TestCase { + /** @var Network */ private $network; public function setUp() @@ -105,6 +106,8 @@ public function test_it_retrieves() $this->assertEquals('networkId', $this->network->id); $this->assertEquals('fakenetwork', $this->network->name); $this->assertEquals('ACTIVE', $this->network->status); + $this->assertEquals(true, $this->network->routerExternal); + $this->assertEquals(false, $this->network->adminStateUp); } public function test_it_deletes()