Fixed populate_db

Author: Mathias Jeschke

webui/app/forms.py

@@ -140,8 +140,9 @@ class DeploymentForm(FlaskForm):
     name = StringField(validators=[DataRequired()],
         render_kw={'placeholder': 'Deployment name', 'autofocus': True})
     cluster = SelectField(
-        choices=[(0, '--- Please select cluster ---')] +
-                [(c.id, c.name) for c in Cluster.query.all()],
+        choices=[(0, '--- Please select cluster ---')],
+        # choices=[(0, '--- Please select cluster ---')] +
+        #         [(c.id, c.name) for c in Cluster.query.all()],
         validators=[DataRequired()],
         coerce=int,
     )

webui/app/views/context.py

@@ -2,7 +2,7 @@
 
 #from app.lib import get_settings
 from app import lib
-from app.models import Cluster, Deployment, Role, Site, User
+from app.models import Cluster, Deployment, Role, User
 
 
 def get_selected_deployment():

webui/data.yaml

@@ -19,15 +19,19 @@ roles:
   users:
   - mmustermann
 
+clusters:
+- name: Demo-Cluster
+  deployments:
+  - ACME
+  - Capitol
+
 deployments:
 - name: ACME
-  ha: true
   sites:
   - Boston
   - New York
   - Chicago
 - name: Capitol
-  ha: false
   sites:
   - Finsdorf
   - Köln

webui/populate_db.py

@@ -63,8 +63,8 @@ def main():
         print(u, u.role)
     db.session.commit()
 
+    cluster_deployments = {}
     for cluster in data.get('clusters', []):
-        cluster_deployments = {}
         deployments = cluster['deployments']
         del(cluster['deployments'])
         c = Cluster(**cluster)
@@ -76,14 +76,16 @@ def main():
     #return
 
     for deployment in data.get('deployments', []):
+        sites = deployment['sites']
+        del(deployment['sites'])
         d = Deployment(**deployment)
-        d.cluster = cluster_deployments[d.name  ]
+        d.cluster = cluster_deployments[d.name]
         db.session.add(d)
         print(d.cluster)
-        # for site in deployment['sites']:
-        #     s = Site(name=site, deployment=d)
-        #     print(s)
-        #     db.session.add(s)
+        for site in sites:
+             s = Site(name=site, deployment=d)
+             print(s)
+             db.session.add(s)
         print(d)
     db.session.commit()