Merge network services (#392)

* Merge all network service extensions into main one using traits
* Add unit test error_reporting
* Increase volume attachment test timeout

Author: k0ka

phpunit.sample.xml.dist

@@ -16,7 +16,7 @@
         </testsuite>
     </testsuites>
     <php>
-        <ini name="error_reporting" value=""/>
+        <ini name="error_reporting" value="-1"/>
         <ini name="display_errors" value="On"/>
         <ini name="display_startup_errors" value="On"/>
     </php>

phpunit.xml.dist

@@ -12,7 +12,7 @@
         </testsuite>
     </testsuites>
     <php>
-        <ini name="error_reporting" value=""/>
+        <ini name="error_reporting" value="-1"/>
         <ini name="display_errors" value="On"/>
         <ini name="display_startup_errors" value="On"/>
     </php>

samples/Networking/v2/floatingIPs/create.php

@@ -12,7 +12,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$networking = $openstack->networkingV2ExtLayer3();
+$networking = $openstack->networkingV2();
 
 $floatingIp = $networking->createFloatingIp([
     "floatingNetworkId" => "{networkId}",

samples/Networking/v2/floatingIPs/delete.php

@@ -12,6 +12,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$openstack->networkingV2ExtLayer3()
-    ->getFloatingIp('{id}')
-    ->delete();
+$networking = $openstack->networkingV2();
+$floatIp = $networking->getFloatingIp('{id}');
+
+$floatIp->delete();

samples/Networking/v2/floatingIPs/get.php

@@ -12,5 +12,5 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$floatingIp = $openstack->networkingV2ExtLayer3()
+$floatingIp = $openstack->networkingV2()
     ->getFloatingIp('{id}');

samples/Networking/v2/floatingIPs/list.php

@@ -12,7 +12,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$floatingIps = $openstack->networkingV2ExtLayer3()
+$floatingIps = $openstack->networkingV2()
     ->listFloatingIps();
 
 foreach ($floatingIps as $floatingIp) {

samples/Networking/v2/floatingIPs/update.php

@@ -12,7 +12,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$floatingIp = $openstack->networkingV2ExtLayer3()
+$floatingIp = $openstack->networkingV2()
     ->getFloatingIp('{id}');
 
 $floatingIp->portId = '{newPortId}';

samples/Networking/v2/securityGroupRules/create.php

@@ -12,7 +12,7 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2ExtSecGroups();
+$networking = $openstack->networkingV2();
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule $rule */
 $rule = $networking->createSecurityGroupRule([

samples/Networking/v2/securityGroupRules/delete.php

@@ -13,7 +13,7 @@
 ]);
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule $rule */
-$rule = $openstack->networkingV2ExtSecGroups()
+$rule = $openstack->networkingV2()
     ->getSecurityGroupRule('{id}');
 
 $rule->delete();

samples/Networking/v2/securityGroupRules/get.php

@@ -13,5 +13,5 @@
 ]);
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule $rule */
-$rule = $openstack->networkingV2ExtSecGroups()
+$rule = $openstack->networkingV2()
     ->getSecurityGroupRule('{id}');