Bugfix: Log in exception part causes crash

[osm/vim-emu.git] / src / emuvim / cli / son_emu_cli.py

diff --git a/src/emuvim/cli/son_emu_cli.py b/src/emuvim/cli/son_emu_cli.py
index 842d0a1..0223818 100755 (executable)
--- a/src/emuvim/cli/son_emu_cli.py
+++ b/src/emuvim/cli/son_emu_cli.py
@@ -1,8 +1,33 @@
 #!/usr/bin/python
 """
- Simple CLI client to interact with a running emulator.
+Copyright (c) 2015 SONATA-NFV and Paderborn University
+ALL RIGHTS RESERVED.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
 
- (c) 2016 by Manuel Peuster <manuel.peuster@upb.de>
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION]
+nor the names of its contributors may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+This work has been performed in the framework of the SONATA project,
+funded by the European Commission under Grant number 671517 through
+the Horizon 2020 and 5G-PPP programmes. The authors would like to
+acknowledge the contributions of their colleagues of the SONATA
+partner consortium (www.sonata-nfv.eu).
+"""
+"""
+ Simple CLI client to interact with a running emulator.
 
  The CLI offers different tools, e.g., compute, network, ...
  Each of these tools is implemented as an independent Python
@@ -13,23 +38,35 @@
 """
 
 import sys
-from emuvim.cli import compute
-from emuvim.cli import network
-from emuvim.cli import datacenter
-from emuvim.cli import monitor
+from emuvim.cli.rest import compute as restcom
+from emuvim.cli.rest import datacenter as restdc
+from emuvim.cli.rest import monitor as restmon
+from emuvim.cli.rest import network as restnetw
+
+def help():
+    print("Missing arguments.\n")
+    print("Usage: son-emu-cli compute|datacenter|network|monitor <arguments>\n")
+    print("Get more help:")
+    print("\tson-emu-cli compute --help")
+    print("\tson-emu-cli datacenter --help")
+    print("\tson-emu-cli network --help")
+    print("\tson-emu-cli monitor --help")
+    exit(0)
 
 def main():
     if len(sys.argv) < 2:
-        print("Usage: son-emu-cli <toolname> <arguments>")
-        exit(0)
-    if sys.argv[1] == "compute":
-        compute.main(sys.argv[2:])
+        help()
+    elif sys.argv[1] == "monitor":
+        restmon.main(sys.argv[2:])
     elif sys.argv[1] == "network":
-        network.main(sys.argv[2:])
+        restnetw.main(sys.argv[2:])
+    elif sys.argv[1] == "compute":
+        restcom.main(sys.argv[2:])
     elif sys.argv[1] == "datacenter":
-        datacenter.main(sys.argv[2:])
-    elif sys.argv[1] == "monitor":
-        monitor.main(sys.argv[2:])
+        restdc.main(sys.argv[2:])
+    else:
+        help()
+
 
 if __name__ == '__main__':
     main()