Merge "Correct the wrong usage of 'format' jsonschema keyword in servers API"

nova/api/openstack/compute/schemas/servers.py

@@ -35,8 +35,8 @@ base_create = {
                         'properties': {
                             'fixed_ip': parameter_types.ip_address,
                             'port': {
-                                'type': ['string', 'null'],
-                                'format': 'uuid'
+                                'oneOf': [{'type': 'string', 'format': 'uuid'},
+                                          {'type': 'null'}]
                             },
                             'uuid': {'type': 'string'},
                         },

nova/tests/unit/api/openstack/compute/test_serversV21.py

@@ -2419,6 +2419,11 @@ class ServersControllerCreateTest(test.TestCase):
         self._check_admin_password_len(server)
         self.assertEqual(FAKE_UUID, server['id'])
 
+    def test_create_instance_with_none_value_port(self):
+        self.body['server'] = {'networks': [{'port': None, 'uuid': FAKE_UUID}]}
+        self.body['server']['name'] = 'test'
+        self._test_create_instance()
+
     def test_create_instance_private_flavor(self):
         values = {
             'name': 'fake_name',