diff options
author | Ulas Kozat <ulas.kozat@gmail.com> | 2017-02-06 15:53:03 -0800 |
---|---|---|
committer | Ulas Kozat <ulas.kozat@gmail.com> | 2017-02-06 15:53:03 -0800 |
commit | 1d3f16e59458942b4112878d6020b6303296dcec (patch) | |
tree | 8c865d0b78f727b255f8d90c9953bc453fcc710d /DominoServer.py | |
parent | 50d396311c07d0c193d7aa956d8704dfa2b2619d (diff) |
JIRA DOMINO-21
Change-Id: I374ec211ca86c50fa22c42f3c410e0d89cbc27ef
Signed-off-by: Ulas Kozat <ulas.kozat@gmail.com>
Diffstat (limited to 'DominoServer.py')
-rwxr-xr-x | DominoServer.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/DominoServer.py b/DominoServer.py index d92b72c..679ca42 100755 --- a/DominoServer.py +++ b/DominoServer.py @@ -16,8 +16,7 @@ import getopt, socket import logging, json import sqlite3, yaml import uuid -#sys.path.append('gen-py') -#sys.path.insert(0, glob.glob('./lib/py/build/lib.*')[0]) + sys.path.insert(0, glob.glob('./lib')[0]) @@ -287,10 +286,17 @@ class CommunicationHandler: node_site = label.select_site( site_map ) logging.debug('Selected Sites: %s', node_site) - # Create per-domain Tosca files - file_paths = partitioner.partition_tosca('./toscafiles/template',node_site,tpl) + # Create per-site Tosca files + tpl_site = {} + file_paths = partitioner.partition_tosca('./toscafiles/template',node_site,tpl,tpl_site) logging.debug('Per domain file paths: %s', file_paths) - + logging.debug('Per domain topologies: %s', tpl_site) + + # Detect boundary links + boundary_VLs, VL_sites = partitioner.return_boundarylinks(tpl_site) + logging.debug('Boundary VLs: %s', boundary_VLs) + logging.debug('VL sites: %s', VL_sites) + # Create work-flow # Assign template UUID if no UUID specified |