From c6dd7669339292d06dcb5f682298c18065597632 Mon Sep 17 00:00:00 2001
From: jmlim <jmlim@os.korea.ac.kr>
Date: Thu, 13 Sep 2018 16:45:30 +0900
Subject: [PATCH] Implement 3 Stella APIs and update README.md

Added Stella APIs are stella, stella/vms, stella/hypervisors.
---
 README.md           | 22 +++++++++++++++++++++-
 Stella-OpenStack.py | 40 +++++++++++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index ad02f2f..2ad0050 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,22 @@
 # Stella-OpenStack
-Stella-OpenStack
+This is Stella-OpenStack code repository.
+
+Stella-OpenStack support Stella VM scheduler to set performance SLA in OpenStack IaaS clouds. 
+
+Visit our project page for detailed information about Stella project.
+project page: http://stella.korea.ac.kr
+github page: https://github.com/KUoslab
+
+## Stella-OpenStack APIs
+Stella-OpenStack APIs(a.k.s Stella APIs) provide access Stella-OpenStack functions.
+
+Stella APIs support RestAPI(http based APIs).
+
+The list of Stella APIs are below. 
+
+1. /stella: Check status of Stella scheduler and Stella-OpenStack.
+2. /stella/vms : Returns the list of VMs and information of each VMs.
+3. /stella/hypervisor : Returns the ip address of hypervisor host. 'hypervisor_name' field is essential.
+
+## contact
+email: starlab@os.korea.ac.kr
\ No newline at end of file
diff --git a/Stella-OpenStack.py b/Stella-OpenStack.py
index 9cc74aa..4a75588 100644
--- a/Stella-OpenStack.py
+++ b/Stella-OpenStack.py
@@ -3,7 +3,7 @@ import logging
 import os
 
 # for API server
-from flask import Flask
+from flask import Flask, jsonify, request, abort
 from flask_restful import Resource, Api
 
 import connect_openstack
@@ -31,7 +31,7 @@ class VM_info:
     # _hypervisor_ip = " "
 
     def print_all(self):
-        print(self._list_vms)
+        return self._list_vms
 
     def print_num(self):
         return len(self._list_vms) + 1
@@ -85,13 +85,37 @@ class Stella_OpenStack(Resource):
         self.logger.info("STELLA: Signal {0}".format(signum))
         self.logger.info("STELLA: STOP")
 
-    # Stella-OpenStack API functions
-    def API_setSLA(self):
 
+# global variables
+hypervisors = hypervisor_info
+vms = VM_info
 
 # Stella-OpenStack API list
-api.add_resource()
-api.add_resource()
+# /stella : Check status of Stella scheduler and Stella-OpenStack
+# /stella/vms : Returns the list of VMs and information of each VMs
+# /stella/hypervisor : Returns the list of VMs and information of each VMs
+@app.route('/stella/', methods=['GET'])
+def StellaAPI_Status():
+    return "Stella-OpenStack is ON"
+
+
+@app.route('/stella/vms', methods=['GET'])
+def StellaAPI_listVMs():
+    return jsonify(vms.print_all(vms))
+
+
+@app.route('/stella/hypervisor', methods=['POST'])
+def StellaAPI_SearchHypervisorsByName():
+    if not request.json or not 'name' in request.json:
+        abort(400)
+    else:
+        _name = request.json['name']
+        # hypervisors.get_data(hypervisors, _name)
+        return jsonify({'hypervisor_ip': hypervisors.get_data(hypervisors, _name)})
+
+
+#
+# Stella-OpenStack API list end
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
@@ -155,7 +179,7 @@ if __name__ == '__main__':
 
     # Make key-value storage for hypervisor
     # e.g. hypervisor name: hypervisor ip
-    hypervisors = hypervisor_info
+    #hypervisors = hypervisor_info
     # print(hypervisors.print_num(hypervisors))
     count = 0
     for index in list_hypervisor_name:
@@ -169,8 +193,6 @@ if __name__ == '__main__':
 
     # Storing VM information
 
-    vms = VM_info
-
     print("VM information")
     for VM in conn.compute.servers():
         # print("VM_NAME: " + VM.name)