Changed DeploymentNetwork to Deployment, adjusted initial_json to include service class json, modified admin screens to only show appropriate topLevel objects (with the exception of Key), added in showAll var to make it easier when developing to showAll the objects in Admin. Removed Django_Evolution objects from admin interface.
diff --git a/planetstack/core/fixtures/initial_data.json b/planetstack/core/fixtures/initial_data.json
index 638b00d..a126e8f 100644
--- a/planetstack/core/fixtures/initial_data.json
+++ b/planetstack/core/fixtures/initial_data.json
@@ -1,7 +1,7 @@
[
{
"pk": 1,
- "model": "core.deploymentnetwork",
+ "model": "core.deployment",
"fields": {
"updated": "2013-04-03T22:57:09.331Z",
"name": "VICCI",
@@ -10,7 +10,7 @@
},
{
"pk": 2,
- "model": "core.deploymentnetwork",
+ "model": "core.deployment",
"fields": {
"updated": "2013-04-03T22:57:15.013Z",
"name": "VINI",
@@ -19,7 +19,7 @@
},
{
"pk": 3,
- "model": "core.deploymentnetwork",
+ "model": "core.deployment",
"fields": {
"updated": "2013-04-03T22:57:23.015Z",
"name": "PlanetLab Classic",
@@ -28,7 +28,7 @@
},
{
"pk": 4,
- "model": "core.deploymentnetwork",
+ "model": "core.deployment",
"fields": {
"updated": "2013-04-03T22:57:29.569Z",
"name": "GENI",
@@ -163,5 +163,164 @@
"deployments": [],
"abbreviated_name": ""
}
+},
+{
+ "pk": 1,
+ "model": "core.user",
+ "fields": {
+ "firstname": "PA",
+ "user_url": null,
+ "lastname": "DMIN",
+ "is_active": true,
+ "site": null,
+ "phone": null,
+ "kuser_id": null,
+ "is_staff": true,
+ "last_login": "2013-05-28T00:10:27.088Z",
+ "key": null,
+ "timezone": "America/New_York",
+ "is_admin": true,
+ "password": "pbkdf2_sha256$10000$uMW3Svx8sYju$Olv9L2iY9WX+eUBsEHtcArU+Jc8P3eLUqt643gb6wVU=",
+ "email": "padmin@vicci.org"
+ }
+},
+{
+ "pk": 1,
+ "model": "core.serviceclass",
+ "fields": {
+ "updated": "2013-05-10T23:30:52.931Z",
+ "membershipFee": 0,
+ "membershipFeeMonths": 0,
+ "created": "2013-05-10T23:30:52.931Z",
+ "upgradeFrom": [
+ 2,
+ 3
+ ],
+ "commitment": 0,
+ "name": "Best Effort",
+ "upgradeRequiresApproval": false,
+ "description": "Best Effort"
+ }
+},
+{
+ "pk": 2,
+ "model": "core.serviceclass",
+ "fields": {
+ "updated": "2013-05-10T23:35:51.694Z",
+ "membershipFee": 100,
+ "membershipFeeMonths": 1,
+ "created": "2013-05-10T23:33:24.930Z",
+ "upgradeFrom": [
+ 1,
+ 3
+ ],
+ "commitment": 365,
+ "name": "Silver",
+ "upgradeRequiresApproval": false,
+ "description": "Silver"
+ }
+},
+{
+ "pk": 3,
+ "model": "core.serviceclass",
+ "fields": {
+ "updated": "2013-05-10T23:34:01.320Z",
+ "membershipFee": 18000,
+ "membershipFeeMonths": 12,
+ "created": "2013-05-10T23:34:01.320Z",
+ "upgradeFrom": [
+ 1,
+ 2
+ ],
+ "commitment": 365,
+ "name": "Gold",
+ "upgradeRequiresApproval": false,
+ "description": "Gold"
+ }
+},
+{
+ "pk": 1,
+ "model": "core.serviceresource",
+ "fields": {
+ "updated": "2013-05-10T23:44:50.862Z",
+ "name": "Cycles",
+ "bucketMaxSize": 0,
+ "created": "2013-05-10T23:37:09.312Z",
+ "serviceClass": 1,
+ "maxUnitsDeployment": 0,
+ "bucketInRate": 0,
+ "cost": 7,
+ "calendarReservable": false,
+ "maxDuration": 0,
+ "maxUnitsNode": 0
+ }
+},
+{
+ "pk": 2,
+ "model": "core.serviceresource",
+ "fields": {
+ "updated": "2013-05-10T23:44:39.936Z",
+ "name": "Cycles",
+ "bucketMaxSize": 0,
+ "created": "2013-05-10T23:44:39.936Z",
+ "serviceClass": 2,
+ "maxUnitsDeployment": 0,
+ "bucketInRate": 0,
+ "cost": 7,
+ "calendarReservable": false,
+ "maxDuration": 0,
+ "maxUnitsNode": 0
+ }
+},
+{
+ "pk": 3,
+ "model": "core.serviceresource",
+ "fields": {
+ "updated": "2013-05-10T23:45:16.137Z",
+ "name": "Cycles",
+ "bucketMaxSize": 0,
+ "created": "2013-05-10T23:45:16.137Z",
+ "serviceClass": 3,
+ "maxUnitsDeployment": 0,
+ "bucketInRate": 0,
+ "cost": 7,
+ "calendarReservable": false,
+ "maxDuration": 0,
+ "maxUnitsNode": 0
+ }
+},
+{
+ "pk": 4,
+ "model": "core.serviceresource",
+ "fields": {
+ "updated": "2013-05-10T23:47:39.033Z",
+ "name": "numberCores",
+ "bucketMaxSize": 210,
+ "created": "2013-05-10T23:46:33.201Z",
+ "serviceClass": 2,
+ "maxUnitsDeployment": 210,
+ "bucketInRate": 10,
+ "cost": 7,
+ "calendarReservable": true,
+ "maxDuration": 168,
+ "maxUnitsNode": 6
+ }
+},
+{
+ "pk": 5,
+ "model": "core.serviceresource",
+ "fields": {
+ "updated": "2013-05-10T23:47:31.771Z",
+ "name": "numberCores",
+ "bucketMaxSize": 0,
+ "created": "2013-05-10T23:47:31.770Z",
+ "serviceClass": 3,
+ "maxUnitsDeployment": 210,
+ "bucketInRate": 0,
+ "cost": 0,
+ "calendarReservable": true,
+ "maxDuration": 8760,
+ "maxUnitsNode": 6
+ }
}
]