66 API

SWSCloudCore/__init__.py

@@ -1,2 +1,2 @@
-from SWSCloudCore.application import app
+
 from SWSCloudCore.config import config

SWSCloudServerAPI/ServerAPI/__init__.py

@@ -9,7 +9,7 @@ from SWSCloudCore.controllers.tasks.server import ControllerTasksServer
 from SWSCloudCore.controllers.containers.server import ControllerContainersServer
 
 api_auth = HTTPBasicAuth()
-viewServerAPI = Blueprint('server_api', __name__, url_prefix='/server_api')
+viewServerAPI = Blueprint('ServerAPI', __name__, url_prefix='/server_api')
 
 
 @api_auth.get_password

SWSCloudWeb/application.py

@@ -1,25 +1,23 @@
 # coding: utf-8
 
-from flask import Flask, g, render_template, request
+from flask import Flask, g, render_template
 from flask_babel import Babel
 from flaskext.markdown import Markdown
 
-from SWSCloudCore.views import viewHomepage
-from SWSCloudCore.views.account import viewAccount
-from SWSCloudCore.views.administrator import viewAdministrator
-from SWSCloudCore.views.api import viewAPI
-from SWSCloudCore.views.containers import viewContainers
-from SWSCloudCore.views.vms import viewVMs
-from SWSCloudCore.views.documents import viewDocuments
-from SWSCloudCore.views.kb import viewKB
-from SWSCloudCore.views.server_api import viewServerAPI
-from SWSCloudCore.views.support import viewSupport
-from SWSCloudCore.views.tasks import viewTasks
-from SWSCloudCore.views.payments import viewPayments
-
 from SWSCloudCore import models
-from SWSCloudCore.models import database
 from SWSCloudCore.config import config
+from SWSCloudCore.models import database
+from SWSCloudServerAPI.ServerAPI import viewServerAPI
+from SWSCloudWeb.views import viewHomepage
+from SWSCloudWeb.views.account import viewAccount
+from SWSCloudWeb.views.administrator import viewAdministrator
+from SWSCloudWeb.views.containers import viewContainers
+from SWSCloudWeb.views.documents import viewDocuments
+from SWSCloudWeb.views.kb import viewKB
+from SWSCloudWeb.views.payments import viewPayments
+from SWSCloudWeb.views.support import viewSupport
+from SWSCloudWeb.views.tasks import viewTasks
+from SWSCloudWeb.views.vms import viewVMs
 
 app = Flask(__name__, static_folder='static', static_url_path='')
 # app.config['SERVER_NAME'] = settings.get('Application', 'SERVER_NAME')
@@ -34,7 +32,6 @@ app.register_blueprint(viewHomepage)
 app.register_blueprint(viewSupport)
 app.register_blueprint(viewKB)
 app.register_blueprint(viewDocuments)
-app.register_blueprint(viewAPI)
 # /tasks
 app.register_blueprint(viewTasks)
 # /containers