Merge remote-tracking branch 'origin/asyncio' into asyncio

Conflicts:
	gns3server/handlers/vpcs_handler.py
	tests/api/test_version.py
	tests/api/test_vpcs.py
This commit is contained in:
Jeremy
2015-01-18 12:23:42 -07:00
20 changed files with 253 additions and 289 deletions

View File

@ -15,7 +15,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from tests.api.base import server, loop
from tests.utils import asyncio_patch
from gns3server import modules
@asyncio_patch('gns3server.modules.VPCS.create_vm', return_value=84)
@ -27,17 +29,41 @@ def test_vpcs_create(server):
assert response.json['id'] == 84
def test_vpcs_nio_create(server):
response = server.post('/vpcs/42/nio', {
'id': 42,
'nio': {
'type': 'nio_unix',
'local_file': '/tmp/test',
'remote_file': '/tmp/remote'
def test_vpcs_nio_create_udp(server):
vm = server.post('/vpcs', {'name': 'PC TEST 1'})
response = server.post('/vpcs/{}/ports/0/nio'.format(vm.json["id"]), {
'type': 'nio_udp',
'lport': 4242,
'rport': 4343,
'rhost': '127.0.0.1'
},
'port': 0,
'port_id': 0},
example=True)
assert response.status == 200
assert response.route == '/vpcs/{id}/nio'
assert response.json['name'] == 'PC 2'
assert response.route == '/vpcs/{id}/ports/{port_id}/nio'
assert response.json['type'] == 'nio_udp'
@patch("gns3server.modules.vpcs.vpcs_device.has_privileged_access", return_value=True)
def test_vpcs_nio_create_tap(mock, server):
vm = server.post('/vpcs', {'name': 'PC TEST 1'})
response = server.post('/vpcs/{}/ports/0/nio'.format(vm.json["id"]), {
'type': 'nio_tap',
'tap_device': 'test',
})
assert response.status == 200
assert response.route == '/vpcs/{vpcs_id}/ports/{port_id}/nio'
assert response.json['type'] == 'nio_tap'
def test_vpcs_delete_nio(server):
vm = server.post('/vpcs', {'name': 'PC TEST 1'})
response = server.post('/vpcs/{}/ports/0/nio'.format(vm.json["id"]), {
'type': 'nio_udp',
'lport': 4242,
'rport': 4343,
'rhost': '127.0.0.1'
},
)
response = server.delete('/vpcs/{}/ports/0/nio'.format(vm.json["vpcs_id"]), example=True)
assert response.status == 200
assert response.route == '/vpcs/{id}/ports/{port_id}/nio'