arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-16 05:18:56 +00:00
Code Issues Releases Wiki Activity

Move code for exposing VM ip to the VM itself. And display VM starting status

Browse Source 
Fix #1621
This commit is contained in:
Julien Duponchelle 2016-10-26 18:32:01 +02:00
parent fd911542f7
commit 620de3ff25
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
3 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gns3server/controller/compute.py
View File

@ -84,13 +84,10 @@ class Compute:
self._id = compute_id self._id = compute_id
self.protocol = protocol self.protocol = protocol
self._console_host = console_host
self.host = host self.host = host
self.port = port self.port = port
self._user = None self._user = None
if console_host is None:
self._console_host = host
else:
self._console_host = console_host
self._password = None self._password = None
self._connected = False self._connected = False
self._closed = False # Close mean we are destroying the compute node self._closed = False # Close mean we are destroying the compute node
@ -217,6 +214,8 @@ class Compute:
@host.setter @host.setter
def host(self, host): def host(self, host):
self._host = host self._host = host
if self._console_host is None:
self._console_host = host
@property @property
def console_host(self): def console_host(self):

15
gns3server/controller/gns3vm/__init__.py
View File

@ -263,15 +263,22 @@ class GNS3VM:
engine.vmname = self._settings["vmname"] engine.vmname = self._settings["vmname"]
engine.ram = self._settings["ram"] engine.ram = self._settings["ram"]
engine.vpcus = self._settings["vcpus"] engine.vpcus = self._settings["vcpus"]
compute = yield from self._controller.add_compute(compute_id="vm",
name="GNS3 VM is starting ({})".format(engine.vmname),
host=None,
force=True)
try:
yield from engine.start() yield from engine.start()
yield from self._controller.add_compute(compute_id="vm", except Exception as e:
name="GNS3 VM ({})".format(engine.vmname), yield from self._controller.delete_compute("vm")
raise e
yield from compute.update(name="GNS3 VM ({})".format(engine.vmname),
protocol=self.protocol, protocol=self.protocol,
host=self.ip_address, host=self.ip_address,
port=self.port, port=self.port,
user=self.user, user=self.user,
password=self.password, password=self.password)
force=True)
@locked_coroutine @locked_coroutine
def _suspend(self): def _suspend(self):

26
gns3server/run.py
View File

@ -29,7 +29,6 @@ import argparse
import shutil import shutil
import psutil import psutil
import asyncio import asyncio
import subprocess
from gns3server.web.web_server import WebServer from gns3server.web.web_server import WebServer
@ -201,29 +200,6 @@ def kill_ghosts():
pass pass
def set_vmware_gns3vm_ip():
"""
For the GNS3 VM on VMware we need to get the ip of eth0.
vmrun getGuestIPAddress is not reliable because it's return a
random ip from one of the available interfaces.
We need to set a VMware variable with the value and this
will allow the VM host machine to retrieve it
"""
vmtoolsd = shutil.which("vmtoolsd")
if not vmtoolsd:
return
ip = None
try:
for a in psutil.net_if_addrs()["eth0"]:
if ":" not in a.address:
ip = a.address
except (KeyError, IndexError):
return
if ip:
subprocess.call(["vmtoolsd", "--cmd", "info-set guestinfo.gns3.eth0 {}".format(ip)])
def run(): def run():
args = parse_arguments(sys.argv[1:]) args = parse_arguments(sys.argv[1:])
@ -247,8 +223,6 @@ def run():
for config_file in Config.instance().get_config_files(): for config_file in Config.instance().get_config_files():
user_log.info("Config file {} loaded".format(config_file)) user_log.info("Config file {} loaded".format(config_file))
set_vmware_gns3vm_ip()
set_config(args) set_config(args)
server_config = Config.instance().get_section_config("Server") server_config = Config.instance().get_section_config("Server")