Merge pull request #106 from deNBI/feature/bioconda

Feature/bioconda

Dockerfile

@@ -2,4 +2,5 @@ FROM python:3.6.6-slim
 ADD . /code
 WORKDIR /code
 RUN pip install -r requirements.txt
+COPY ansible.cfg /etc/ansible/
 WORKDIR /code/VirtualMachineService

VirtualMachineService/VirtualMachineServer.py

@@ -4,12 +4,12 @@
 try:
     from VirtualMachineService import Client, Processor
 except Exception:
-    from .VirtualMachineService import Client, Processor
+    from VirtualMachineService import Client, Processor
 
 try:
     from VirtualMachineHandler import VirtualMachineHandler
 except Exception:
-    from .VirtualMachineHandler import VirtualMachineHandler
+    from VirtualMachineHandler import VirtualMachineHandler
 
 from thrift.transport import TSSLSocket
 from thrift.transport import TTransport

VirtualMachineService/VirtualMachineService-remote

@@ -37,10 +37,12 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
     print('  string add_floating_ip_to_server(string openstack_id, string network)')
     print('  bool create_connection(string username, string password, string auth_url, string user_domain_name, string project_domain_name)')
     print('   start_server(string flavor, string image, string public_key, string servername, string elixir_id, string diskspace, string volumename)')
+    print('   start_server_with_custom_key(string flavor, string image, string servername, string elixir_id, string diskspace, string volumename)')
+    print('  int create_and_deploy_playbook(string private_key, string play_source, string openstack_id)')
     print('  bool add_security_group_to_server(bool http, bool https, bool udp, string server_id)')
     print('  VM get_server(string openstack_id)')
     print('  bool stop_server(string openstack_id)')
-    print('  string create_snapshot(string openstack_id, string name, string elixir_id, string base_tag)')
+    print('  string create_snapshot(string openstack_id, string name, string elixir_id, string base_tag, string description)')
     print('   get_limits()')
     print('  bool delete_image(string image_id)')
     print('  bool delete_volume_attachment(string volume_id, string server_id)')
@@ -208,6 +210,18 @@ elif cmd == 'start_server':
         sys.exit(1)
     pp.pprint(client.start_server(args[0], args[1], args[2], args[3], args[4], args[5], args[6],))
 
+elif cmd == 'start_server_with_custom_key':
+    if len(args) != 6:
+        print('start_server_with_custom_key requires 6 args')
+        sys.exit(1)
+    pp.pprint(client.start_server_with_custom_key(args[0], args[1], args[2], args[3], args[4], args[5],))
+
+elif cmd == 'create_and_deploy_playbook':
+    if len(args) != 3:
+        print('create_and_deploy_playbook requires 3 args')
+        sys.exit(1)
+    pp.pprint(client.create_and_deploy_playbook(args[0], args[1], args[2],))
+
 elif cmd == 'add_security_group_to_server':
     if len(args) != 4:
         print('add_security_group_to_server requires 4 args')
@@ -227,10 +241,10 @@ elif cmd == 'stop_server':
     pp.pprint(client.stop_server(args[0],))
 
 elif cmd == 'create_snapshot':
-    if len(args) != 4:
-        print('create_snapshot requires 4 args')
+    if len(args) != 5:
+        print('create_snapshot requires 5 args')
         sys.exit(1)
-    pp.pprint(client.create_snapshot(args[0], args[1], args[2], args[3],))
+    pp.pprint(client.create_snapshot(args[0], args[1], args[2], args[3], args[4],))
 
 elif cmd == 'get_limits':
     if len(args) != 0: