Merge pull request #104 from php-opencloud/ISSUE-103-port-fixed-ips

[rfr] Issue 103 port fixed ips

Author: Jamie Hannaford

.travis.yml

@@ -9,6 +9,7 @@ cache:
 matrix:
   include:
     - php: 7.0
+    - php: 7.1
     - php: nightly
   allow_failures:
     - php: nightly

samples/networking/v2/ports/create_with_fixed_ips.php

@@ -0,0 +1,26 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$networking = $openstack->networkingV2();
+
+$port = $networking->createPort([
+    'name'         => 'portName',
+    'networkId'    => '{networkId}',
+    'adminStateUp' => true,
+    'fixedIps' => [
+        [
+            'ipAddress' => '192.168.199.100'
+        ],
+        [
+            'ipAddress' => '192.168.199.200'
+        ]
+    ]
+]);

samples/networking/v2/subnets/delete.php

@@ -18,6 +18,6 @@
 
 $networking = $openstack->networkingV2();
 
-$network = $networking->getSubnet('{subnetId}');
+$subnet = $networking->getSubnet('{subnetId}');
 
-$network->delete();
+$subnet->delete();

src/Networking/v2/Params.php

@@ -282,10 +282,27 @@ public function macAddr(): array
     public function fixedIps(): array
     {
         return [
-            'type'        => self::STRING_TYPE,
+            'type'        => self::ARRAY_TYPE,
             'location'    => self::JSON,
             'sentAs'      => 'fixed_ips',
-            'description' => 'If you specify only a subnet UUID, OpenStack Networking allocates an available IP from that subnet to the port. If you specify both a subnet UUID and an IP address, OpenStack Networking tries to allocate the address to the port.',
+            'description' => 'The IP addresses for the port. If you would like to assign multiple IP addresses for the 
+                              port, specify multiple entries in this field. Each entry consists of IP address (ipAddress)
+                              and the subnet ID from which the IP address is assigned (subnetId)',
+            'items'       => [
+                'type'    => self::OBJECT_TYPE,
+                'properties' => [
+                    'ipAddress' => [
+                        'type' => self::STRING_TYPE,
+                        'sentAs' => 'ip_address',
+                        'description' => 'If you specify only an IP address, OpenStack Networking tries to allocate the IP address if the address is a valid IP for any of the subnets on the specified network.'
+                    ],
+                    'subnetId' => [
+                        'type' => self::STRING_TYPE,
+                        'sentAs' => 'subnet_id',
+                        'description' => 'Subnet id. If you specify only a subnet ID, OpenStack Networking allocates an available IP from that subnet to the port.'
+                    ]
+                ]
+            ]
         ];
     }
 

tests/integration/Networking/v2/CoreTest.php

@@ -273,6 +273,8 @@ private function deleteSubnet($subnetId)
 
     public function ports()
     {
+        $this->logStep('Test port');
+
         $replacements = ['{newName}' => $this->randomStr()];
 
         /** @var $network \OpenStack\Networking\v2\Models\Network */
@@ -284,7 +286,6 @@ public function ports()
         /** @var $port \OpenStack\Networking\v2\Models\Port */
         $path = $this->sampleFile($replacements, 'ports/create.php');
         require_once $path;
-        $this->assertInstanceOf(Port::class, $port);
 
         $replacements['{portId}'] = $port->id;
         $port->networkId = $network->id;
@@ -316,5 +317,43 @@ public function ports()
 
         $path = $this->sampleFile($replacements, 'networks/delete.php');
         require_once $path;
+
+        $this->createPortWithFixedIps();
+    }
+
+    private function createPortWithFixedIps()
+    {
+        $this->logStep('Test port with fixed IP');
+
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile(['{networkName}' => $this->randomStr()], 'networks/create.php');
+        require_once $path;
+        $this->logStep('Created network {id}', ['{id}' => $network->id]);
+
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        $path = $this->sampleFile(['{subnetName}' => $this->randomStr(), '{networkId}' => $network->id], 'subnets/create.php');
+        require_once $path;
+        $this->logStep('Created subnet {id}', ['{id}' => $subnet->id]);
+
+        /** @var $port \OpenStack\Networking\v2\Models\Port */
+        $path = $this->sampleFile(['{networkId}' => $network->id], 'ports/create_with_fixed_ips.php');
+        require_once $path;
+        $this->logStep('Created port {id}', ['{id}' => $port->id]);
+
+        $path = $this->sampleFile(['{portId}' => $port->id], 'ports/delete.php');
+        require_once $path;
+
+        $this->logStep('Deleted port {id}', ['{id}' => $port->id]);
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        $path = $this->sampleFile(['{subnetId}' => $subnet->id], 'subnets/delete.php');
+        require_once $path;
+        $this->logStep('Deleted subnet {id}', ['{id}' => $subnet->id]);
+
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile(['{networkId}' => $network->id], 'networks/delete.php');
+        require_once $path;
+        $this->logStep('Deleted network {id}', ['{id}' => $network->id]);
     }
 }

tests/unit/Networking/v2/Fixtures/GET_port.resp renamed to tests/unit/Networking/v2/Fixtures/port_get.resp

@@ -0,0 +1,45 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+   "port":{
+      "status":"DOWN",
+      "binding:host_id":"",
+      "description":"",
+      "allowed_address_pairs":[
+
+      ],
+      "extra_dhcp_opts":[
+
+      ],
+      "updated_at":"2017-02-24T07:31:56Z",
+      "device_owner":"",
+      "revision_number":5,
+      "binding:profile":{
+
+      },
+      "fixed_ips":[
+         {
+            "subnet_id":"d8e52c33-b301-4feb-9856-a71b71f06c1d",
+            "ip_address":"192.168.254.20"
+         }
+      ],
+      "id":"a87cc70a-3e15-4acf-8205-9b711a3531b8",
+      "security_groups":[
+         "38172d7a-233f-49ba-b47c-91a66b92c7b4"
+      ],
+      "device_id":"",
+      "name":"",
+      "admin_state_up":true,
+      "network_id":"a87cc70a-3e15-4acf-8205-9b711a3531b7",
+      "tenant_id":"500e0da6e1b54d65a81ba6fe922c65d1",
+      "binding:vif_details":{
+
+      },
+      "binding:vnic_type":"normal",
+      "binding:vif_type":"unbound",
+      "mac_address":"fa:16:3e:34:87:49",
+      "project_id":"500e0da6e1b54d65a81ba6fe922c65d1",
+      "created_at":"2017-02-24T07:31:55Z"
+   }
+}