move dashboard-deployment and flavor-deployment relations out of fixture and into tosca
diff --git a/xos/configurations/common/mydeployment.yaml b/xos/configurations/common/mydeployment.yaml
index cdf3c84..ab7d3c2 100644
--- a/xos/configurations/common/mydeployment.yaml
+++ b/xos/configurations/common/mydeployment.yaml
@@ -9,6 +9,8 @@
node_templates:
MyDeployment:
type: tosca.nodes.Deployment
+ properties:
+ flavors: m1.large, m1.medium, m1.small
mysite:
type: tosca.nodes.Site
@@ -18,10 +20,14 @@
- deployment:
node: MyDeployment
relationship: tosca.relationships.SiteDeployment
- requirements:
- - controller:
- node: newcontroller
- relationship: tosca.relationships.UsesController
+
+ # Include the Tenant view so we can make it a default of padmin@vicci.org
+ Tenant:
+ type: tosca.nodes.DashboardView
+ properties:
+ no-create: true
+ no-update: true
+ no-delete: true
padmin@vicci.org:
type: tosca.nodes.User
@@ -35,4 +41,7 @@
- site:
node: mysite
relationship: tosca.relationships.MemberOfSite
+ - tenant_dashboard:
+ node: Tenant
+ relationship: tosca.relationships.UsesDashboard
diff --git a/xos/core/fixtures/core_initial_data.json b/xos/core/fixtures/core_initial_data.json
index 96bc857..840ef43 100644
--- a/xos/core/fixtures/core_initial_data.json
+++ b/xos/core/fixtures/core_initial_data.json
@@ -57,23 +57,6 @@
},
{
"fields": {
- "updated": "2015-02-17T22:06:37.893Z",
- "policed": null,
- "created": "2015-02-17T22:06:37.893Z",
- "deleted": false,
- "availability_zone": null,
- "site": 1,
- "backend_register": "{}",
- "controller": null,
- "deployment": 1,
- "backend_status": "0 - Provisioning in progress",
- "enacted": null
- },
- "model": "core.sitedeployment",
- "pk": 1
-},
-{
- "fields": {
"updated": "2015-02-17T22:06:38.953Z",
"policed": null,
"created": "2015-02-17T22:06:38.953Z",
@@ -113,7 +96,6 @@
"created": "2015-02-17T22:06:39.069Z",
"deleted": false,
"deployments": [
- 1
],
"enabled": true,
"name": "Tenant",
@@ -169,7 +151,6 @@
"created": "2015-02-17T22:06:38.095Z",
"deleted": false,
"deployments": [
- 1
],
"description": null,
"name": "m1.small",
@@ -190,7 +171,6 @@
"created": "2015-02-17T22:06:38.287Z",
"deleted": false,
"deployments": [
- 1
],
"description": null,
"name": "m1.medium",
@@ -211,7 +191,6 @@
"created": "2015-02-17T22:06:38.445Z",
"deleted": false,
"deployments": [
- 1
],
"description": null,
"name": "m1.large",