c78a86c558
tests-functional-py3.txt:
* Remove all tests except snowman from blacklist
* snowman seems to be a gabbi problem under py35
nova/objects/resource_provider.py:
* Cannot compare None and integer under py35
* wrap keys() in a list before comparing to a list as
keys() is an iterator
nova/virt/fake.py:
* list_instance_uuids should return a list, keys() returns
an iterator.
nova/tests/functional/api_sample_tests/*.py:
* use response.text to compare with a string as response.context
contains bytes under python3
* user_data should be strings not bytes, so convert them
as necessary
nova/tests/functional/regressions/test_bug_1554631.py:
* cinder exceptions need the http code as the first parameter
(not a string)
* use response.text to compare with a string as response.context
contains bytes under python3
nova/tests/functional/test_servers.py:
* zlib.compress needs bytes
Change-Id: I73be94afbb02dac46467555a8469f222a69025da
62 lines
2.4 KiB
Python
62 lines
2.4 KiB
Python
# Copyright 2012 Nebula, Inc.
|
|
# Copyright 2014 IBM Corp.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from nova.tests.functional.api_sample_tests import api_sample_base
|
|
|
|
|
|
class NetworksAssociateJsonTests(api_sample_base.ApiSampleTestBaseV21):
|
|
ADMIN_API = True
|
|
sample_dir = "os-networks-associate"
|
|
|
|
_sentinel = object()
|
|
|
|
def setUp(self):
|
|
super(NetworksAssociateJsonTests, self).setUp()
|
|
|
|
def fake_associate(self, context, network_id,
|
|
host=NetworksAssociateJsonTests._sentinel,
|
|
project=NetworksAssociateJsonTests._sentinel):
|
|
return True
|
|
|
|
self.stub_out("nova.network.api.API.associate", fake_associate)
|
|
|
|
def test_disassociate(self):
|
|
response = self._do_post('os-networks/1/action',
|
|
'network-disassociate-req',
|
|
{})
|
|
self.assertEqual(202, response.status_code)
|
|
self.assertEqual("", response.text)
|
|
|
|
def test_disassociate_host(self):
|
|
response = self._do_post('os-networks/1/action',
|
|
'network-disassociate-host-req',
|
|
{})
|
|
self.assertEqual(202, response.status_code)
|
|
self.assertEqual("", response.text)
|
|
|
|
def test_disassociate_project(self):
|
|
response = self._do_post('os-networks/1/action',
|
|
'network-disassociate-project-req',
|
|
{})
|
|
self.assertEqual(202, response.status_code)
|
|
self.assertEqual("", response.text)
|
|
|
|
def test_associate_host(self):
|
|
response = self._do_post('os-networks/1/action',
|
|
'network-associate-host-req',
|
|
{"host": "testHost"})
|
|
self.assertEqual(202, response.status_code)
|
|
self.assertEqual("", response.text)
|