diff options
| -rw-r--r-- | INFO.yaml | 43 | ||||
| -rwxr-xr-x | domino_cli.py | 7 | ||||
| -rwxr-xr-x | tests/run_multinode.sh | 13 |
3 files changed, 56 insertions, 7 deletions
diff --git a/INFO.yaml b/INFO.yaml new file mode 100644 index 0000000..0465b0b --- /dev/null +++ b/INFO.yaml @@ -0,0 +1,43 @@ +--- +project: 'Template Distribution Service (Domino)' +project_creation_date: 'March 22, 2016' +project_category: 'Requirements' +lifecycle_state: 'Incubation' +project_lead: &opnfv_domino_ptl + name: 'Ulas Kozat' + email: 'ulas.kozat@huawei.com' + company: 'huawei.com' + id: 'kozat' +primary_contact: *opnfv_domino_ptl +issue_tracking: + type: 'jira' + url: 'https://jira.opnfv.org/projects/DOMINO' + key: 'DOMINO' +mailing_list: + type: 'mailman2' + url: 'opnfv-tech-discuss@lists.opnfv.org' + tag: '[domino]' +realtime_discussion: + type: irc + server: 'freenode.net' + channel: '#opnfv-domino' +meetings: + - type: 'gotomeeting+irc' + agenda: # eg: 'https://wiki.opnfv.org/display/' + url: # eg: 'https://global.gotomeeting.com/join/819733085' + server: 'freenode.net' + channel: '#opnfv-meeting' + repeats: 'weekly' + time: # eg: '16:00 UTC' +repositories: + - 'domino' +committers: + - <<: *opnfv_domino_ptl + - name: 'Prakash Ramchandran' + email: 'prakash.ramchandran@huawei.com' + company: 'huawei.com' + id: 'rprakash' +# yamllint disable rule:line-length +tsc: + approval: 'http//ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2016/opnfv-meeting.2016-03-22-14.00.html' +# yamllint enable rule:line-length diff --git a/domino_cli.py b/domino_cli.py index 5cb0b1c..e1bbfbb 100755 --- a/domino_cli.py +++ b/domino_cli.py @@ -13,8 +13,13 @@ import sys, glob, getopt import getopt +import pkg_resources -sys.path.insert(0, glob.glob('./lib')[0]) +try: + dir = pkg_resources.resource_filename('lib','.') +except ImportError: + dir = './lib' +sys.path.insert(0, glob.glob(dir)[0]) from dominoCLI import DominoClientCLI from dominoCLI.ttypes import * diff --git a/tests/run_multinode.sh b/tests/run_multinode.sh index 5ccdf65..235eaf1 100755 --- a/tests/run_multinode.sh +++ b/tests/run_multinode.sh @@ -17,12 +17,13 @@ CLIENT1_CLIPORT=9100 CLIENT2_CLIPORT=9200 LOGLEVEL=DEBUG -toscafile_test1=./tosca-templates/tosca_helloworld_nfv.yaml -test1_reffile1=./tests/refdata/test1_client1.ref -test1_reffile2=./tests/refdata/test1_client2.ref -client1_log=./tests/logdata/client1.log -client2_log=./tests/logdata/client2.log -server_log=./tests/logdata/server.log +dir=$(python -c "import sysconfig; print sysconfig.get_path('platlib')") +toscafile_test1=${dir}/tosca-templates/tosca_helloworld_nfv.yaml +test1_reffile1=${dir}/tests/refdata/test1_client1.ref +test1_reffile2=${dir}/tests/refdata/test1_client2.ref +client1_log=${dir}/tests/logdata/client1.log +client2_log=${dir}/tests/logdata/client2.log +server_log=${dir}/tests/logdata/server.log start_server() { |