X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fscripts%2Fosm.py;h=d1cd3499e9d3f0e41ef744ac4621ca38d236dfea;hb=refs%2Fchanges%2F54%2F6854%2F2;hp=52761030731ce064c499166341801268eca68b59;hpb=c4cd58f1fa79599a489730b41cda4cf43f552ecd;p=osm%2Fosmclient.git

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index 5276103..d1cd349 100755
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -25,6 +25,7 @@ from prettytable import PrettyTable
 import yaml
 import json
 import time
+import pycurl
 
 def check_client_version(obj, what, version='sol005'):
     '''
@@ -45,7 +46,7 @@ def check_client_version(obj, what, version='sol005'):
 
 @click.group()
 @click.option('--hostname',
-              default=None,
+              default="127.0.0.1",
               envvar='OSM_HOSTNAME',
               help='hostname of server.  ' +
                    'Also can set OSM_HOSTNAME in environment')
@@ -89,7 +90,7 @@ def cli(ctx, hostname, so_port, so_project, ro_hostname, ro_port, sol005):
         kwargs['ro_host']=ro_hostname
     if ro_port is not None:
         kwargs['ro_port']=ro_port
-    
+
     ctx.obj = client.Client(host=hostname, sol005=sol005, **kwargs)
 
 
@@ -704,11 +705,13 @@ def vnfd_create2(ctx, filename, overwrite):
               help='administration status')
 @click.option('--ssh_keys',
               default=None,
-              help='comma separated list of keys to inject to vnfs')
+              help='comma separated list of public key files to inject to vnfs')
 @click.option('--config',
               default=None,
-              help='ns specific yaml configuration:\nvnf: [member-vnf-index: TEXT, vim_account: TEXT]\n'
-              'vld: [name: TEXT, vim-network-name: TEXT or DICT with vim_account, vim_net entries]')
+              help='ns specific yaml configuration')
+@click.option('--config_file',
+              default=None,
+              help='ns specific yaml configuration file')
 @click.pass_context
 def ns_create(ctx,
               nsd_name,
@@ -716,11 +719,16 @@ def ns_create(ctx,
               vim_account,
               admin_status,
               ssh_keys,
-              config):
+              config,
+              config_file):
     '''creates a new NS instance'''
     try:
-        # if config:
-        #     check_client_version(ctx.obj, '--config', 'v1')
+        if config_file:
+            check_client_version(ctx.obj, '--config_file')
+            if config:
+                raise ClientException('"--config" option is incompatible with "--config_file" option')
+            with open(config_file, 'r') as cf:
+                config=cf.read()
         ctx.obj.ns.create(
             nsd_name,
             ns_name,
@@ -904,7 +912,7 @@ def ns_delete(ctx, name, force):
 ####################
 # VIM operations
 ####################
- 
+
 @cli.command(name='vim-create')
 @click.option('--name',
               prompt=True,
@@ -1560,4 +1568,11 @@ def ns_action(ctx,
 
 
 if __name__ == '__main__':
-    cli()
+    try:
+        cli()
+    except pycurl.error as e:
+        print(e)
+        print('Maybe "--hostname" option or OSM_HOSTNAME' +
+            'environment variable needs to be specified')
+        exit(1)
+