Embed the appliances in the server.

This add a /appliances call
This commit is contained in:
Julien Duponchelle committed 2017-02-01 11:30:14 +01:00
1 parent 5204cec9e6
commit dc6756d5ae
96 files changed
+6346 -1

No files matched your search

+18 -1
View File
@@ -24,13 +24,14 @@ import aiohttp
from ..config import Config
from .project import Project
from .appliance import Appliance
from .compute import Compute, ComputeError
from .notification import Notification
from .symbols import Symbols
from ..version import __version__
from .topology import load_topology
from .gns3vm import GNS3VM
from ..utils.get_resource import get_resource
import logging
log = logging.getLogger(__name__)
@@ -42,6 +43,9 @@ class Controller:
def __init__(self):
self._computes = {}
self._projects = {}
self._appliances = {}
self.load_appliances()
self._notification = Notification(self)
self.gns3vm = GNS3VM(self)
self.symbols = Symbols()
@@ -51,6 +55,12 @@ class Controller:
self._config_file = os.path.join(Config.instance().config_dir, "gns3_controller.conf")
log.info("Load controller configuration file {}".format(self._config_file))
def load_appliances(self):
for file in os.listdir(get_resource('appliances')):
with open(os.path.join(get_resource('appliances'), file)) as f:
appliance = Appliance(None, json.load(f))
self._appliances[appliance.id] = appliance
@asyncio.coroutine
def start(self):
log.info("Start controller")
@@ -429,6 +439,13 @@ class Controller:
"""
return self._projects
@property
def appliances(self):
"""
:returns: The dictionary of appliances managed by GNS3
"""
return self._appliances
def projects_directory(self):
server_config = Config.instance().get_section_config("Server")
return os.path.expanduser(server_config.get("projects_path", "~/GNS3/projects"))
+38
View File
@@ -0,0 +1,38 @@
#!/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 uuid
class Appliance:
def __init__(self, appliance_id, data):
if appliance_id is None:
self._id = str(uuid.uuid4())
else:
self._id = appliance_id
self._data = data
@property
def id(self):
return self._id
def __json__(self):
"""
Appliance data (a hash)
"""
return self._data