Merge branch 'master' of git.rackster.ch:ipynbsrv/ipynbsrv

coco-project · Aug 9, 2015 · 5ce286c · 5ce286c
2 parents d0971a7 + 85786f3
commit 5ce286c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 33 deletions.
diff --git a/ipynbsrv/admin/templates/admin/core/container/change_form.html b/ipynbsrv/admin/templates/admin/core/container/change_form.html
@@ -19,16 +19,16 @@ <h2>Actions</h2>
     <fieldset class="module aligned ">
         <h2>Status Actions</h2>
         <div class="form-row">
-            {% if original.is_suspended %}
-                <input type="submit" value="{% trans 'Resume' %}" name="_resume" {{ onclick_attrib }} />
-            {% else %}
-                {% if original.is_running %}
-                    <input type="submit" value="{% trans 'Restart' %}" name="_restart" {{ onclick_attrib }} />
-                    <input type="submit" value="{% trans 'Stop' %}" name="_stop" {{ onclick_attrib }} />
-                    <input type="submit" value="{% trans 'Suspend' %}" name="_suspend" {{ onclick_attrib }} />
+            {% if original.is_running %}
+                <input type="submit" value="{% trans 'Restart' %}" name="_restart" {{ onclick_attrib }} />
+                <input type="submit" value="{% trans 'Stop' %}" name="_stop" {{ onclick_attrib }} />
+                {% if original.is_suspended %}
+                    <input type="submit" value="{% trans 'Resume' %}" name="_resume" {{ onclick_attrib }} />
                 {% else %}
-                    <input type="submit" value="{% trans 'Start' %}" name="_start" {{ onclick_attrib }} />
+                    <input type="submit" value="{% trans 'Suspend' %}" name="_suspend" {{ onclick_attrib }} />
                 {% endif %}
+            {% else %}
+                <input type="submit" value="{% trans 'Start' %}" name="_start" {{ onclick_attrib }} />
             {% endif %}
         </div>
     </fieldset>

diff --git a/ipynbsrv/core/models.py b/ipynbsrv/core/models.py
@@ -740,7 +740,6 @@ def __unicode__(self):
 
     class Meta:
         unique_together = (
-            ('backend_pk', 'server'),
             ('name', 'owner')
         )
 

diff --git a/ipynbsrv/core/signals/backend_users.py b/ipynbsrv/core/signals/backend_users.py
@@ -29,7 +29,7 @@ def create_on_internal_ldap(sender, user, **kwargs):
                 user.backend_pk,
                 user.django_user.password,
                 user.primary_group.backend_id,
-                '/home/user'
+                '/home/' + user.get_username()
             )
             # FIXME: this is the first time we really know the ID/PK given by the backend.
             # all other operations having used to old ones might not be valid anymore...

diff --git a/ipynbsrv/core/signals/container_images.py b/ipynbsrv/core/signals/container_images.py
@@ -56,7 +56,7 @@ def delete_on_server(sender, image, **kwargs):
                 try:
                     # FIXME: isn't deleted....
                     backend = server.get_container_backend()
-                    backend.delete_container_image(image.backend_pk, force=True)
+                    backend.delete_container_image(image.backend_pk)
                 except ContainerImageNotFoundError:
                     pass  # already removed
                 except ContainerBackendError as ex:

diff --git a/ipynbsrv/core/signals/container_snapshots.py b/ipynbsrv/core/signals/container_snapshots.py
@@ -34,7 +34,7 @@ def delete_on_server(sender, snapshot, **kwargs):
     if snapshot is not None:
         backend = snapshot.container.server.get_container_backend()
         try:
-            backend.delete_container_snapshot(snapshot.backend_pk, force=True)
+            backend.delete_container_snapshot(snapshot.backend_pk)
         except ContainerSnapshotNotFoundError as ex:
             pass  # already removed?
         except ContainerBackendError as ex:

diff --git a/ipynbsrv/core/signals/containers.py b/ipynbsrv/core/signals/containers.py
@@ -36,15 +36,14 @@ def create_on_server(sender, container, **kwargs):
         result = None
         try:
             result = container.server.get_container_backend().create_container(
-                container.get_backend_name(),
+                container.owner.backend_pk,
+                container.owner.backend_id,
+                container.name,
                 ports,
                 [
                     {   # home directory
-                        ContainerBackend.VOLUME_KEY_SOURCE: path.join(
-                            path.join(storage_backend.base_dir, settings.STORAGE_DIR_HOME),
-                            container.owner.backend_pk
-                        ),
-                        ContainerBackend.VOLUME_KEY_TARGET: path.join('/home', 'user')
+                        ContainerBackend.VOLUME_KEY_SOURCE: path.join(storage_backend.base_dir, settings.STORAGE_DIR_HOME),
+                        ContainerBackend.VOLUME_KEY_TARGET: '/home'
                     },
                     {   # public directory
                         ContainerBackend.VOLUME_KEY_SOURCE: path.join(storage_backend.base_dir, settings.STORAGE_DIR_PUBLIC),
@@ -101,21 +100,7 @@ def delete_on_server(sender, container, **kwargs):
     """
     if container is not None:
         try:
-            if container.is_suspended():
-                container.resume()
-        except:
-            pass
-        try:
-            if container.is_running():
-                container.stop()
-        except:
-            pass
-
-        try:
-            container.server.get_container_backend().delete_container(
-                container.backend_pk,
-                force=True
-            )
+            container.server.get_container_backend().delete_container(container.backend_pk)
         except ContainerNotFoundError as ex:
             pass  # already deleted
         except ContainerBackendError as ex: