Commit 35caaf19 authored by Daniele Venzano's avatar Daniele Venzano

Refactor code

The database is no longer a singleton
The swarm manager is a singleton managed at package level
parent 51327582
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BashSupportProjectSettings">
<option name="supportBash4" value="true" />
</component>
</project>
\ No newline at end of file
......@@ -6,6 +6,7 @@
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TemplatesService">
<option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
<option name="TEMPLATE_FOLDERS">
<list>
<option value="$MODULE_DIR$/caaas/templates" />
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value />
</option>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
</component>
</project>
\ No newline at end of file
......@@ -3,6 +3,7 @@
<words>
<w>caaas</w>
<w>jinja</w>
<w>venza</w>
</words>
</dictionary>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/caaas/sql.py" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/images/notebook/files/start-notebook.sh" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
......
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="SpellCheckingInspection" enabled="true" level="TYPO" enabled_by_default="true">
<option name="processCode" value="false" />
<option name="processLiterals" value="true" />
<option name="processComments" value="true" />
</inspection_tool>
</profile>
</component>
\ No newline at end of file
<component name="InspectionProjectProfileManager">
<settings>
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_PROFILE" value="true" />
<version value="1.0" />
</settings>
</component>
\ No newline at end of file
......@@ -2,10 +2,31 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="75bc5abc-acc8-44ff-9d8a-85151a0cbca1" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/caaas/cluster_description.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/images/notebook/files/application.conf" afterPath="$PROJECT_DIR$/images/notebook/files/application.conf" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/images/notebook/files/start-notebook.sh" afterPath="$PROJECT_DIR$/images/notebook/files/start-notebook.sh" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/swarm.py" afterPath="$PROJECT_DIR$/caaas/swarm.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/utils/__init__.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/bashsupport_project.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/codeStyleSettings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/utils/config.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/__init__.py" afterPath="$PROJECT_DIR$/caaas/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/apache-proxy.py" afterPath="$PROJECT_DIR$/apache-proxy.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/api.py" afterPath="$PROJECT_DIR$/caaas/api.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/base.html" afterPath="$PROJECT_DIR$/caaas/templates/base.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/caaas.iml" afterPath="$PROJECT_DIR$/.idea/caaas.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas.ini.template" afterPath="$PROJECT_DIR$/caaas.ini.template" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/cluster_description.py" afterPath="$PROJECT_DIR$/caaas/cluster_description.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/home.html" afterPath="$PROJECT_DIR$/caaas/templates/home.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/index.html" afterPath="$PROJECT_DIR$/caaas/templates/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/main.py" afterPath="$PROJECT_DIR$/main.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/notebook.html" afterPath="$PROJECT_DIR$/caaas/templates/notebook.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/sql.py" afterPath="$PROJECT_DIR$/caaas/sql.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/status.html" afterPath="$PROJECT_DIR$/caaas/templates/status.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/user-status.html" afterPath="$PROJECT_DIR$/caaas/templates/user-status.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dictionaries/venzano.xml" afterPath="$PROJECT_DIR$/.idea/dictionaries/venzano.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/web.py" afterPath="$PROJECT_DIR$/caaas/web.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MOVED" beforePath="E:\User Data\vcs\caaas\caaas\swarm.py" afterPath="$PROJECT_DIR$/caaas/swarm_manager.py" />
</list>
<ignored path="caaas.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -19,7 +40,7 @@
</component>
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/caaas$main.coverage" NAME="main Coverage Results" MODIFIED="1438787337072" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
<SUITE FILE_PATH="coverage/caaas$main.coverage" NAME="main Coverage Results" MODIFIED="1438848774194" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
<SUITE FILE_PATH="coverage/caaas$apache_proxy.coverage" NAME="apache-proxy Coverage Results" MODIFIED="1438786630433" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component>
<component name="CreatePatchCommitExecutor">
......@@ -123,79 +144,45 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="swarm.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/caaas/swarm.py">
<file leaf-file-name="main.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.9378239">
<caret line="126" column="0" selection-start-line="126" selection-start-column="0" selection-end-line="126" selection-end-column="0" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
<state vertical-scroll-proportion="0.0">
<caret line="0" column="18" selection-start-line="0" selection-start-column="18" selection-end-line="0" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="cluster_description.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/cluster_description.py">
<file leaf-file-name="swarm_manager.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/swarm_manager.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="4" column="31" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
<folding />
<caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="sql.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/sql.py">
<file leaf-file-name="web.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/caaas/web.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="134" column="25" selection-start-line="134" selection-start-column="25" selection-end-line="134" selection-end-column="25" />
<state vertical-scroll-proportion="1.0863558">
<caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
<folding>
<element signature="e#0#22#0" expanded="true" />
<element signature="e#174#312#0" expanded="false" />
<marker date="1438786583972" expanded="true" signature="414:450" placeholder="SELECT id FR..users..." />
<marker date="1438786583972" expanded="true" signature="854:894" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="1200:1230" placeholder="SELECT id, u..users..." />
<marker date="1438786583972" expanded="true" signature="1542:1571" placeholder="SELECT COUNT..clusters..." />
<marker date="1438786583972" expanded="true" signature="1634:1678" placeholder="SELECT COUNT..clusters..." />
<marker date="1438786583972" expanded="true" signature="1994:2025" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2131:2177" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2297:2346" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2473:2519" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2473:2525" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2473:2537" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2799:2837" placeholder="SELECT * FRO..notebooks..." />
<marker date="1438786583972" expanded="true" signature="3321:3358" placeholder="SELECT url F..proxy..." />
<marker date="1438786583972" expanded="true" signature="3726:3783" placeholder="SELECT proxy..proxy..." />
<marker date="1438786583972" expanded="true" signature="4137:4189" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="4451:4507" placeholder="UPDATE clust..." />
<marker date="1438786583972" expanded="true" signature="4776:4881" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="5209:5309" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="5590:5681" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="6013:6067" placeholder="SELECT COUNT..clusters..." />
<marker date="1438786583972" expanded="true" signature="6130:6184" placeholder="SELECT id, u..clusters..." />
<marker date="1438786583972" expanded="true" signature="6130:6199" placeholder="SELECT COUNT..clusters..." />
<marker date="1438786583972" expanded="true" signature="6723:6802" placeholder="SELECT id, d..containers..." />
<marker date="1438786583972" expanded="true" signature="6908:7002" placeholder="SELECT id, u..clusters..." />
<marker date="1438786583972" expanded="true" signature="7122:7219" placeholder="SELECT id, d..containers..." />
<marker date="1438786583972" expanded="true" signature="7346:7440" placeholder="SELECT id, d..containers..." />
<marker date="1438786583972" expanded="true" signature="7346:7458" placeholder="SELECT id, d..containers..." />
<marker date="1438786583972" expanded="true" signature="7985:8002" placeholder="DELETE FROM ..." />
<marker date="1438786583972" expanded="true" signature="7985:8022" placeholder="DELETE FROM ..." />
<marker date="1438786583972" expanded="true" signature="7996:7997" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="8212:8253" placeholder="DELETE FROM ..." />
<marker date="1438786583972" expanded="true" signature="8444:8476" placeholder="DELETE FROM ..." />
<marker date="1438786583972" expanded="true" signature="8663:8693" placeholder="DELETE FROM ..." />
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="user-status.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/user-status.html">
<file leaf-file-name="cluster_description.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/cluster_description.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.230769">
<caret line="8" column="73" selection-start-line="8" selection-start-column="73" selection-end-line="8" selection-end-column="73" />
<state vertical-scroll-proportion="0.0">
<caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -205,57 +192,98 @@
<entry file="file://$PROJECT_DIR$/apache-proxy.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
<folding />
<caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
<folding>
<element signature="e#0#27#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="api.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/api.py">
<file leaf-file-name="sql.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/sql.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<folding />
<caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding>
<element signature="e#0#22#0" expanded="true" />
<marker date="1438847310165" expanded="true" signature="852:888" placeholder="SELECT id FR..users..." />
<marker date="1438847310165" expanded="true" signature="1257:1297" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="1590:1620" placeholder="SELECT id, u..users..." />
<marker date="1438847310165" expanded="true" signature="1919:1948" placeholder="SELECT COUNT..clusters..." />
<marker date="1438847310165" expanded="true" signature="2011:2055" placeholder="SELECT COUNT..clusters..." />
<marker date="1438847310165" expanded="true" signature="2358:2389" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="2495:2541" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="2661:2710" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="2837:2883" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="2837:2889" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="2837:2901" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="3150:3188" placeholder="SELECT * FRO..notebooks..." />
<marker date="1438847310165" expanded="true" signature="3655:3692" placeholder="SELECT url F..proxy..." />
<marker date="1438847310165" expanded="true" signature="4025:4082" placeholder="SELECT proxy..proxy..." />
<marker date="1438847310165" expanded="true" signature="4423:4475" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="4724:4780" placeholder="UPDATE clust..." />
<marker date="1438847310165" expanded="true" signature="5010:5115" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="5430:5530" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="5798:5889" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="6208:6262" placeholder="SELECT COUNT..clusters..." />
<marker date="1438847310165" expanded="true" signature="6325:6379" placeholder="SELECT id, u..clusters..." />
<marker date="1438847310165" expanded="true" signature="6325:6394" placeholder="SELECT COUNT..clusters..." />
<marker date="1438847310165" expanded="true" signature="6905:6984" placeholder="SELECT id, d..containers..." />
<marker date="1438847310165" expanded="true" signature="7090:7184" placeholder="SELECT id, u..clusters..." />
<marker date="1438847310165" expanded="true" signature="7304:7401" placeholder="SELECT id, d..containers..." />
<marker date="1438847310165" expanded="true" signature="7528:7622" placeholder="SELECT id, d..containers..." />
<marker date="1438847310165" expanded="true" signature="7528:7640" placeholder="SELECT id, d..containers..." />
<marker date="1438847310165" expanded="true" signature="8154:8171" placeholder="DELETE FROM ..." />
<marker date="1438847310165" expanded="true" signature="8154:8191" placeholder="DELETE FROM ..." />
<marker date="1438847310165" expanded="true" signature="8165:8166" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="8368:8409" placeholder="DELETE FROM ..." />
<marker date="1438847310165" expanded="true" signature="8587:8619" placeholder="DELETE FROM ..." />
<marker date="1438847310165" expanded="true" signature="8793:8823" placeholder="DELETE FROM ..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="start-notebook.sh" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/images/notebook/files/start-notebook.sh">
<file leaf-file-name="api.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/api.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="4" column="112" selection-start-line="4" selection-start-column="112" selection-end-line="4" selection-end-column="112" />
<folding />
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="application.conf" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/images/notebook/files/application.conf">
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="13" column="45" selection-start-line="13" selection-start-column="45" selection-end-line="13" selection-end-column="45" />
<folding />
<caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/images/submit/Dockerfile">
<file leaf-file-name="caaas.ini" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas.ini">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<caret line="1" column="22" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="submit.sh" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/images/submit/files/submit.sh">
<file leaf-file-name="caaas.ini.template" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas.ini.template">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<caret line="1" column="22" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
<folding />
</state>
</provider>
......@@ -278,15 +306,10 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/caaas/swarm_status.py" />
<option value="$PROJECT_DIR$/caaas.ini.template" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/caaas/templates/notebook.html" />
<option value="$PROJECT_DIR$/caaas/templates/status.html" />
<option value="$PROJECT_DIR$/caaas/proxy.py" />
<option value="$PROJECT_DIR$/caaas/apache-proxy.py" />
<option value="$PROJECT_DIR$/caaas.wsgi" />
<option value="$PROJECT_DIR$/main.py" />
<option value="$PROJECT_DIR$/caaas.ini" />
<option value="$PROJECT_DIR$/images/templates/master.tmpl" />
<option value="$PROJECT_DIR$/images/templates/common.tmpl" />
<option value="$PROJECT_DIR$/images/templates/shell.tmpl" />
......@@ -295,23 +318,34 @@
<option value="$PROJECT_DIR$/images/build_images.sh" />
<option value="$PROJECT_DIR$/images/notebook/Dockerfile" />
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/caaas/__init__.py" />
<option value="$APPLICATION_CONFIG_DIR$/consoles/db/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/console.sql" />
<option value="$PROJECT_DIR$/images/notebook/files/application.conf" />
<option value="$PROJECT_DIR$/images/notebook/files/start-notebook.sh" />
<option value="$PROJECT_DIR$/caaas/cluster_description.py" />
<option value="$PROJECT_DIR$/caaas/templates/base.html" />
<option value="$PROJECT_DIR$/caaas/templates/index.html" />
<option value="$PROJECT_DIR$/caaas/templates/home.html" />
<option value="$PROJECT_DIR$/caaas/web.py" />
<option value="$PROJECT_DIR$/caaas/templates/index.html" />
<option value="$PROJECT_DIR$/caaas/templates/notebook.html" />
<option value="$PROJECT_DIR$/caaas/templates/status.html" />
<option value="$PROJECT_DIR$/caaas/templates/user-status.html" />
<option value="$PROJECT_DIR$/caaas/api.py" />
<option value="$PROJECT_DIR$/utils/config.py" />
<option value="$PROJECT_DIR$/apache-proxy.py" />
<option value="$APPLICATION_CONFIG_DIR$/consoles/db/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/console.sql" />
<option value="$PROJECT_DIR$/caaas/sql.py" />
<option value="$PROJECT_DIR$/images/notebook/files/application.conf" />
<option value="$PROJECT_DIR$/images/notebook/files/start-notebook.sh" />
<option value="$PROJECT_DIR$/caaas/cluster_description.py" />
<option value="$PROJECT_DIR$/caaas.ini" />
<option value="$PROJECT_DIR$/caaas.ini.template" />
<option value="$PROJECT_DIR$/main.py" />
<option value="$PROJECT_DIR$/caaas/swarm.py" />
<option value="$PROJECT_DIR$/caaas/swarm_manager.py" />
<option value="$PROJECT_DIR$/caaas/__init__.py" />
<option value="$PROJECT_DIR$/caaas/api.py" />
<option value="$PROJECT_DIR$/caaas/web.py" />
</list>
</option>
</component>
<component name="JsBowerSettings">
<exe-path />
<config-path />
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
......@@ -332,13 +366,52 @@
<State>
<id />
</State>
<State>
<id>BashSupport</id>
</State>
<State>
<id>CSS</id>
</State>
<State>
<id>Code style issuesJavaScript</id>
</State>
<State>
<id>Django</id>
</State>
<State>
<id>General</id>
</State>
<State>
<id>HAML</id>
</State>
<State>
<id>JavaScript</id>
</State>
<State>
<id>JavaScript function metricsJavaScript</id>
</State>
<State>
<id>Naming conventionsJavaScript</id>
</State>
<State>
<id>Probable bugsCSS</id>
</State>
<State>
<id>Probable bugsJavaScript</id>
</State>
<State>
<id>Python</id>
</State>
<State>
<id>SQL</id>
</State>
<State>
<id>Spelling</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>Buildout</id>
<id>SpellCheckingInspection</id>
</State>
</selected-state>
</profile-state>
......@@ -396,7 +469,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="scripts" />
<option name="myItemId" value="utils" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
......@@ -410,7 +483,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="caaas" />
<option name="myItemId" value="scripts" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
......@@ -427,10 +500,6 @@
<option name="myItemId" value="caaas" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
......@@ -438,7 +507,7 @@
</panes>
</component>
<component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
<property name="settings.editor.selected.configurable" value="preferences.sourceCode" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="E:/User Software/WinPython-64bit-2.7.9.3/python-2.7.9.amd64/python.exe" />
......@@ -750,6 +819,9 @@
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="UnknownFeatures">
<option featureType="com.intellij.fileTypeFactory" implementationName="*.template" />
</component>
<component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
......@@ -763,13 +835,6 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="python-line">
<url>file://$PROJECT_DIR$/apache-proxy.py</url>
<line>81</line>
<option name="timeStamp" value="21" />
</line-breakpoint>
</breakpoints>
<default-breakpoints>
<breakpoint type="python-exception">
<properties notifyOnTerminate="true" exception="BaseException">
......@@ -782,14 +847,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/caaas.ini">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/new_cluster.sh">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
......@@ -801,9 +858,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#37#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -827,40 +882,39 @@
<caret line="39" column="0" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
<folding>
<element signature="e#0#22#0" expanded="true" />
<element signature="e#174#312#0" expanded="false" />
<marker date="1438786583972" expanded="true" signature="414:450" placeholder="SELECT id FR..users..." />
<marker date="1438786583972" expanded="true" signature="854:894" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="1200:1230" placeholder="SELECT id, u..users..." />
<marker date="1438786583972" expanded="true" signature="1542:1571" placeholder="SELECT COUNT..clusters..." />
<marker date="1438786583972" expanded="true" signature="1634:1678" placeholder="SELECT COUNT..clusters..." />
<marker date="1438786583972" expanded="true" signature="1994:2025" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2131:2177" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2297:2346" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2473:2519" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2473:2525" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2473:2537" placeholder="SELECT COUNT..containers..." />
<marker date="1438786583972" expanded="true" signature="2799:2837" placeholder="SELECT * FRO..notebooks..." />
<marker date="1438786583972" expanded="true" signature="3321:3358" placeholder="SELECT url F..proxy..." />
<marker date="1438786583972" expanded="true" signature="3726:3783" placeholder="SELECT proxy..proxy..." />
<marker date="1438786583972" expanded="true" signature="4137:4189" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="4451:4507" placeholder="UPDATE clust..." />
<marker date="1438786583972" expanded="true" signature="4776:4881" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="5209:5309" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="5590:5681" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="6013:6067" placeholder="SELECT COUNT..clusters..." />
<marker date="1438786583972" expanded="true" signature="6130:6184" placeholder="SELECT id, u..clusters..." />
<marker date="1438786583972" expanded="true" signature="6130:6199" placeholder="SELECT COUNT..clusters..." />
<marker date="1438786583972" expanded="true" signature="6723:6802" placeholder="SELECT id, d..containers..." />
<marker date="1438786583972" expanded="true" signature="6908:7002" placeholder="SELECT id, u..clusters..." />
<marker date="1438786583972" expanded="true" signature="7122:7219" placeholder="SELECT id, d..containers..." />
<marker date="1438786583972" expanded="true" signature="7346:7440" placeholder="SELECT id, d..containers..." />
<marker date="1438786583972" expanded="true" signature="7346:7458" placeholder="SELECT id, d..containers..." />
<marker date="1438786583972" expanded="true" signature="7985:8002" placeholder="DELETE FROM ..." />
<marker date="1438786583972" expanded="true" signature="7985:8022" placeholder="DELETE FROM ..." />
<marker date="1438786583972" expanded="true" signature="7996:7997" placeholder="INSERT INTO ..." />
<marker date="1438786583972" expanded="true" signature="8212:8253" placeholder="DELETE FROM ..." />
<marker date="1438786583972" expanded="true" signature="8444:8476" placeholder="DELETE FROM ..." />
<marker date="1438786583972" expanded="true" signature="8663:8693" placeholder="DELETE FROM ..." />
<marker date="1438847310165" expanded="true" signature="852:888" placeholder="SELECT id FR..users..." />
<marker date="1438847310165" expanded="true" signature="1257:1297" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="1590:1620" placeholder="SELECT id, u..users..." />
<marker date="1438847310165" expanded="true" signature="1919:1948" placeholder="SELECT COUNT..clusters..." />
<marker date="1438847310165" expanded="true" signature="2011:2055" placeholder="SELECT COUNT..clusters..." />
<marker date="1438847310165" expanded="true" signature="2358:2389" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="2495:2541" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="2661:2710" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="2837:2883" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="2837:2889" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="2837:2901" placeholder="SELECT COUNT..containers..." />
<marker date="1438847310165" expanded="true" signature="3150:3188" placeholder="SELECT * FRO..notebooks..." />
<marker date="1438847310165" expanded="true" signature="3655:3692" placeholder="SELECT url F..proxy..." />
<marker date="1438847310165" expanded="true" signature="4025:4082" placeholder="SELECT proxy..proxy..." />
<marker date="1438847310165" expanded="true" signature="4423:4475" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="4724:4780" placeholder="UPDATE clust..." />
<marker date="1438847310165" expanded="true" signature="5010:5115" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="5430:5530" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="5798:5889" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="6208:6262" placeholder="SELECT COUNT..clusters..." />
<marker date="1438847310165" expanded="true" signature="6325:6379" placeholder="SELECT id, u..clusters..." />
<marker date="1438847310165" expanded="true" signature="6325:6394" placeholder="SELECT COUNT..clusters..." />
<marker date="1438847310165" expanded="true" signature="6905:6984" placeholder="SELECT id, d..containers..." />
<marker date="1438847310165" expanded="true" signature="7090:7184" placeholder="SELECT id, u..clusters..." />
<marker date="1438847310165" expanded="true" signature="7304:7401" placeholder="SELECT id, d..containers..." />
<marker date="1438847310165" expanded="true" signature="7528:7622" placeholder="SELECT id, d..containers..." />
<marker date="1438847310165" expanded="true" signature="7528:7640" placeholder="SELECT id, d..containers..." />
<marker date="1438847310165" expanded="true" signature="8154:8171" placeholder="DELETE FROM ..." />
<marker date="1438847310165" expanded="true" signature="8154:8191" placeholder="DELETE FROM ..." />
<marker date="1438847310165" expanded="true" signature="8165:8166" placeholder="INSERT INTO ..." />
<marker date="1438847310165" expanded="true" signature="8368:8409" placeholder="DELETE FROM ..." />
<marker date="1438847310165" expanded="true" signature="8587:8619" placeholder="DELETE FROM ..." />
<marker date="1438847310165" expanded="true" signature="8793:8823" placeholder="DELETE FROM ..." />
</folding>
</state>
</provider>
......@@ -877,7 +931,7 @@
<state vertical-scroll-proportion="0.0">
<caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
<folding>
<element signature="e#0#30#0" expanded="false" />
<element signature="e#0#31#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -889,7 +943,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/swarm.py">
<entry file="file://$PROJECT_DIR$/caaas/swarm_manager.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="39" column="0" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
......@@ -921,13 +975,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas.ini.template">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.34273624">
......@@ -986,24 +1033,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas.ini">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
<folding>
<element signature="e#0#37#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/templates/master.tmpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
......@@ -1097,66 +1126,90 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/__init__.py">
<entry file="file://$USER_HOME$/.PyCharm40/system/remote_sources/461916380/-102312246/flask/app.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="18" column="14" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
<caret line="983" column="0" selection-start-line="983" selection-start-column="0" selection-end-line="983" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/index.html">
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/console.sql">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-4.576923">
<caret line="7" column="76" selection-start-line="7" selection-start-column="76" selection-end-line="7" selection-end-column="76" />
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/notebook.html">
<entry file="file://$PROJECT_DIR$/images/submit/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.65384614">
<caret line="1" column="31" selection-start-line="1" selection-start-column="31" selection-end-line="1" selection-end-column="31" />
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/home.html">
<entry file="file://$PROJECT_DIR$/images/notebook/files/application.conf">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.076923">
<caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<state vertical-scroll-proportion="0.0">
<caret line="13" column="45" selection-start-line="13" selection-start-column="45" selection-end-line="13" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/status.html">