Merge pull request #1571 from grycap/wheel

Wheel

.github/workflows/main.yaml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python 3.
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Install dependencies
         run: python -m pip install tox

IM/REST.py

@@ -19,6 +19,8 @@
 import json
 import base64
 import flask
+import os
+import yaml
 
 from cheroot.wsgi import Server as WSGIServer, PathInfoDispatcher
 from cheroot.ssl.builtin import BuiltinSSLAdapter
@@ -939,6 +941,15 @@ def RESTGetVersion():
         return return_error(400, "Error getting IM version: %s" % get_ex_error(ex))
 
 
+@app.route('/')
+def RESTIndex():
+    rest_path = os.path.dirname(os.path.abspath(__file__))
+    abs_file_path = os.path.join(rest_path, 'swagger_api.yaml')
+    api_docs = yaml.safe_load(open(abs_file_path, 'r'))
+    api_docs['servers'][0]['url'] = flask.request.url_root
+    return flask.make_response(json.dumps(api_docs), 200, {'Content-Type': 'application/json'})
+
+
 @app.route('/infrastructures/<infid>/vms/<vmid>/disks/<disknum>/snapshot', methods=['PUT'])
 def RESTCreateDiskSnapshot(infid=None, vmid=None, disknum=None):
     try:

IM/config.py

@@ -67,7 +67,7 @@ class Config:
     LOG_FILE = '/var/log/im/inf.log'
     LOG_FILE_MAX_SIZE = 10485760
     LOG_LEVEL = "INFO"
-    CONTEXTUALIZATION_DIR = '/usr/share/im/contextualization'
+    CONTEXTUALIZATION_DIR = IM_PATH + '/../contextualization'
     RECIPES_DIR = CONTEXTUALIZATION_DIR + '/AnsibleRecipes'
     RECIPES_DB_FILE = CONTEXTUALIZATION_DIR + '/recipes_ansible.db'
     MAX_CONTEXTUALIZATION_TIME = 7200

im_service.py → IM/im_service.py

@@ -33,9 +33,6 @@
 from IM.ServiceRequests import IMBaseRequest
 from IM import __version__ as version
 
-if sys.version_info <= (2, 6):
-    print("Must use python 2.6 or greater")
-    sys.exit(1)
 
 logger = logging.getLogger('InfrastructureManager')
 
@@ -420,7 +417,7 @@ def signal_int_handler(signal, frame):
     im_stop()
 
 
-if __name__ == "__main__":
+def main():
     parser = argparse.ArgumentParser(description='IM service')
     parser.add_argument('--version', help='Show IM service version.', dest="version",
                         action="store_true", default=False)
@@ -436,3 +433,7 @@ def signal_int_handler(signal, frame):
 
     config_logging()
     launch_daemon()
+
+
+if __name__ == "__main__":
+    main()