Link API should work now need to implement the client

This commit is contained in:
Julien Duponchelle committed 2016-03-11 20:13:52 +01:00
1 parent 6a19e4d822
commit 65099b9364
7 files changed
+163 -4

No files matched your search

+2 -1
View File
@@ -21,9 +21,10 @@ import asyncio
class Link:
def __init__(self):
def __init__(self, project):
self._id = str(uuid.uuid4())
self._vms = []
self._project = project
@asyncio.coroutine
def addVM(self, vm, adapter_number, port_number):
+1 -1
View File
@@ -98,7 +98,7 @@ class Project:
"""
Create a link. By default the link is empty
"""
link = Link()
link = Link(self)
self._links[link.id] = link
return link
+61
View File
@@ -0,0 +1,61 @@
#!/usr/bin/env python
#
# Copyright (C) 2016 GNS3 Technologies Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import asyncio
from .link import Link
class UDPLink(Link):
pass
@asyncio.coroutine
def create(self):
"""
Create the link on the VMs
"""
vm1 = self._vms[0]["vm"]
adapter_number1 = self._vms[0]["adapter_number"]
port_number1 = self._vms[0]["port_number"]
vm2 = self._vms[1]["vm"]
adapter_number2 = self._vms[1]["adapter_number"]
port_number2 = self._vms[1]["port_number"]
# Reserve a TCP port on both side
response = yield from vm1.post("/ports/udp".format(self._project.id))
vm1_port = response.json["udp_port"]
response = yield from vm2.post("/ports/udp".format(self._project.id))
vm2_port = response.json["udp_port"]
# Create the tunnel on both side
data = {
"lport": vm1_port,
"rhost": vm2.hypervisor.host,
"rport": vm2_port,
"type": "nio_udp"
}
yield from vm1.post("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number1, port_number=port_number1), data=data)
data = {
"lport": vm2_port,
"rhost": vm1.hypervisor.host,
"rport": vm1_port,
"type": "nio_udp"
}
yield from vm2.post("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number2, port_number=port_number2), data=data)
+11
View File
@@ -72,6 +72,10 @@ class VM:
def project(self):
return self._project
@property
def hypervisor(self):
return self._hypervisor
@asyncio.coroutine
def create(self):
data = copy.copy(self._properties)
@@ -81,6 +85,13 @@ class VM:
data["console_type"] = self._console_type
yield from self._hypervisor.post("/projects/{}/{}/vms".format(self._project.id, self._vm_type), data=data)
@asyncio.coroutine
def post(self, path, data={}):
"""
HTTP post on the VM
"""
return (yield from self._hypervisor.post("/projects/{}/{}/vms/{}{}".format(self._project.id, self._vm_type, self._id, path), data=data))
def __json__(self):
return {
"hypervisor_id": self._hypervisor.id,