Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/tosca/tests/deploymenttest.py b/xos/tosca/tests/deploymenttest.py
index 1df55de..a08b2f9 100644
--- a/xos/tosca/tests/deploymenttest.py
+++ b/xos/tosca/tests/deploymenttest.py
@@ -1,29 +1,78 @@
from basetest import BaseToscaTest
-from core.models import Deployment
+from core.models import Deployment, Image
class DeploymentTest(BaseToscaTest):
tests = ["create_deployment_minimal",
"create_deployment_maximal",
+ "create_deployment_one_flavor",
+ "create_deployment_two_flavors",
+ "create_deployment_one_image",
+ "create_deployment_two_images",
"destroy_deployment",
]
def cleanup(self):
self.try_to_delete(Deployment, name="testdep")
+ self.try_to_delete(Image, name="testimg1")
+ self.try_to_delete(Image, name="testimg2")
def create_deployment_minimal(self):
self.assert_noobj(Deployment, "testdep")
self.execute(self.make_nodetemplate("testdep", "tosca.nodes.Deployment"))
- instance = self.assert_obj(Deployment, "testdep",
+ dep = self.assert_obj(Deployment, "testdep",
accessControl="allow all")
+ assert(not dep.flavors.exists()) # there should be no flavors
+ assert(not dep.images.exists()) # there should be no images
+
def create_deployment_maximal(self):
self.assert_noobj(Deployment, "testdep")
self.execute(self.make_nodetemplate("testdep", "tosca.nodes.Deployment",
props={"accessControl": "allow padmin@vicci.org"}))
- instance = self.assert_obj(Deployment, "testdep",
+ dep = self.assert_obj(Deployment, "testdep",
accessControl="allow padmin@vicci.org")
+ def create_deployment_one_flavor(self):
+ self.assert_noobj(Deployment, "testdep")
+ self.execute(self.make_nodetemplate("testdep", "tosca.nodes.Deployment",
+ props={"accessControl": "allow padmin@vicci.org",
+ "flavors": "m1.small"}))
+ dep = self.assert_obj(Deployment, "testdep",
+ accessControl="allow padmin@vicci.org")
+
+ assert( sorted([f.name for f in dep.flavors.all()]) == ["m1.small"] )
+
+ def create_deployment_two_flavors(self):
+ self.assert_noobj(Deployment, "testdep")
+ self.execute(self.make_nodetemplate("testdep", "tosca.nodes.Deployment",
+ props={"accessControl": "allow padmin@vicci.org",
+ "flavors": "m1.small, m1.medium"}))
+ dep = self.assert_obj(Deployment, "testdep",
+ accessControl="allow padmin@vicci.org")
+
+ assert( sorted([f.name for f in dep.flavors.all()]) == ["m1.medium", "m1.small"] )
+
+ def create_deployment_one_image(self):
+ self.assert_noobj(Deployment, "testdep")
+ self.execute(self.make_nodetemplate("testimg1", "tosca.nodes.Image") +
+ self.make_nodetemplate("testdep", "tosca.nodes.Deployment",
+ reqs=[("testimg1", "tosca.relationships.SupportsImage")]))
+ dep = self.assert_obj(Deployment, "testdep",
+ accessControl="allow all")
+ assert( sorted([f.name for f in dep.images.all()]) == ["testimg1"] )
+
+ def create_deployment_two_images(self):
+ self.assert_noobj(Deployment, "testdep")
+ self.execute(self.make_nodetemplate("testimg1", "tosca.nodes.Image") +
+ self.make_nodetemplate("testimg2", "tosca.nodes.Image") +
+ self.make_nodetemplate("testdep", "tosca.nodes.Deployment",
+ reqs=[("testimg1", "tosca.relationships.SupportsImage"),
+ ("testimg2", "tosca.relationships.SupportsImage")]))
+ dep = self.assert_obj(Deployment, "testdep",
+ accessControl="allow all")
+ assert( sorted([f.name for f in dep.images.all()]) == ["testimg1", "testimg2"] )
+
def destroy_deployment(self):
self.assert_noobj(Deployment, "testdep")
self.execute(self.make_nodetemplate("testdep", "tosca.nodes.Deployment"))