Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
diff --git a/planetstack/core/fixtures/initial_data.json b/planetstack/core/fixtures/initial_data.json
index c0c6f38..ba41542 100644
--- a/planetstack/core/fixtures/initial_data.json
+++ b/planetstack/core/fixtures/initial_data.json
@@ -530,7 +530,6 @@
"is_active": true,
"site": null,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2014-04-22T11:32:36.356Z",
"timezone": "America/New_York",
@@ -555,7 +554,6 @@
"is_active": true,
"site": 22,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-12-14T03:21:24.872Z",
"timezone": "America/New_York",
@@ -580,7 +578,6 @@
"is_active": true,
"site": 22,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-12-04T20:46:15.904Z",
"timezone": "America/New_York",
@@ -605,7 +602,6 @@
"is_active": true,
"site": 22,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-12-18T21:47:08.698Z",
"timezone": "America/New_York",
@@ -630,7 +626,6 @@
"is_active": true,
"site": 22,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-12-17T16:21:46.493Z",
"timezone": "America/New_York",
@@ -655,7 +650,6 @@
"is_active": true,
"site": 10,
"phone": "",
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-09-22T21:48:01.047Z",
"timezone": "America/New_York",
@@ -680,7 +674,6 @@
"is_active": true,
"site": 22,
"phone": "",
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-12-18T21:41:10.802Z",
"timezone": "America/New_York",
@@ -705,7 +698,6 @@
"is_active": true,
"site": 22,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-12-19T01:32:31.049Z",
"timezone": "America/New_York",
@@ -730,7 +722,6 @@
"is_active": true,
"site": 22,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-09-22T21:48:01.047Z",
"timezone": "America/New_York",
@@ -755,7 +746,6 @@
"is_active": true,
"site": 22,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-09-22T21:48:01.047Z",
"timezone": "America/New_York",
@@ -780,7 +770,6 @@
"is_active": true,
"site": 22,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-09-22T21:48:01.047Z",
"timezone": "America/New_York",
@@ -805,7 +794,6 @@
"is_active": true,
"site": 22,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-09-22T21:48:01.047Z",
"timezone": "America/New_York",
@@ -830,7 +818,6 @@
"is_active": true,
"site": 22,
"phone": null,
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-09-22T21:48:01.047Z",
"timezone": "America/New_York",
@@ -855,7 +842,6 @@
"is_active": true,
"site": 22,
"phone": "",
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-12-19T00:59:55.668Z",
"timezone": "America/New_York",
@@ -880,7 +866,6 @@
"is_active": true,
"site": 24,
"phone": "",
- "kuser_id": null,
"is_staff": true,
"last_login": "2013-12-17T18:08:01.356Z",
"timezone": "America/New_York",
@@ -951,19 +936,15 @@
"pk": 4,
"model": "core.slice",
"fields": {
- "router_id": null,
"updated": "2013-12-18T22:24:44.850Z",
"name": "HyperCache",
"service": 3,
"created": "2013-04-03T23:14:11.072Z",
- "network_id": null,
- "tenant_id": "",
"description": "HyperCache slice for HyperCache service.",
"serviceClass": 1,
"enabled": true,
"site": 22,
"omf_friendly": false,
- "subnet_id": null,
"slice_url": "",
"creator": 1,
"enacted": null
@@ -973,19 +954,15 @@
"pk": 6,
"model": "core.slice",
"fields": {
- "router_id": null,
"updated": "2013-12-19T00:14:36.783Z",
"name": "Syndicate",
"service": 5,
"created": "2013-04-03T23:14:11.072Z",
- "network_id": null,
- "tenant_id": "",
"description": "",
"serviceClass": 1,
"enabled": true,
"site": 22,
"omf_friendly": false,
- "subnet_id": null,
"slice_url": "",
"creator": 1,
"enacted": null
@@ -995,19 +972,15 @@
"pk": 8,
"model": "core.slice",
"fields": {
- "router_id": null,
"updated": "2013-12-19T00:15:11.298Z",
"name": "DnsRedir",
"service": 4,
"created": "2013-12-04T22:48:35.584Z",
- "network_id": null,
- "tenant_id": "",
"description": "DNS Redirection slice for RequestRouter service.",
"serviceClass": 2,
"enabled": true,
"site": 22,
"omf_friendly": false,
- "subnet_id": null,
"slice_url": "",
"creator": 8,
"enacted": null
@@ -1017,19 +990,15 @@
"pk": 9,
"model": "core.slice",
"fields": {
- "router_id": null,
"updated": "2013-12-18T23:32:07.617Z",
"name": "DnsDemux",
"service": 4,
"created": "2013-12-04T22:49:23.051Z",
- "network_id": null,
- "tenant_id": "",
"description": "DNS Demultiplexing slice for RequestRouter service. ",
"serviceClass": 2,
"enabled": true,
"site": 22,
"omf_friendly": false,
- "subnet_id": null,
"slice_url": "",
"creator": 8,
"enacted": null
@@ -1039,19 +1008,15 @@
"pk": 10,
"model": "core.slice",
"fields": {
- "router_id": null,
"updated": "2013-12-18T22:06:00.330Z",
"name": "Infrastructure",
"service": null,
"created": "2013-12-09T14:13:15.392Z",
- "network_id": null,
- "tenant_id": "",
"description": "",
"serviceClass": 1,
"enabled": true,
"site": 22,
"omf_friendly": false,
- "subnet_id": null,
"slice_url": "",
"creator": null,
"enacted": null
@@ -1061,19 +1026,15 @@
"pk": 11,
"model": "core.slice",
"fields": {
- "router_id": null,
"updated": "2013-12-17T18:09:29.065Z",
"name": "Stork",
"service": 8,
"created": "2013-12-13T21:49:59.476Z",
- "network_id": null,
- "tenant_id": "",
"description": "The Stork Package Management Service",
"serviceClass": 1,
"enabled": true,
"site": 24,
"omf_friendly": false,
- "subnet_id": null,
"slice_url": "",
"creator": null,
"enacted": null
@@ -1083,19 +1044,15 @@
"pk": 12,
"model": "core.slice",
"fields": {
- "router_id": null,
"updated": "2013-12-17T18:09:20.587Z",
"name": "Owl",
"service": 8,
"created": "2013-12-13T21:52:15.590Z",
- "network_id": null,
- "tenant_id": "",
"description": "The Owl Data Collection service",
"serviceClass": 1,
"enabled": true,
"site": 24,
"omf_friendly": false,
- "subnet_id": null,
"slice_url": "",
"creator": null,
"enacted": null
@@ -1105,19 +1062,15 @@
"pk": 13,
"model": "core.slice",
"fields": {
- "router_id": null,
"updated": "2013-12-18T23:34:55.351Z",
"name": "Hadoop",
"service": null,
"created": "2013-12-13T21:54:20.895Z",
- "network_id": null,
- "tenant_id": "",
"description": "Hadoop map-reduce service",
"serviceClass": 2,
"enabled": true,
"site": 22,
"omf_friendly": false,
- "subnet_id": null,
"slice_url": "",
"creator": null,
"enacted": null
@@ -1127,19 +1080,15 @@
"pk": 14,
"model": "core.slice",
"fields": {
- "router_id": null,
"updated": "2013-12-18T22:21:36.462Z",
"name": "test",
"service": null,
"created": "2013-12-13T21:56:57.299Z",
- "network_id": null,
- "tenant_id": "",
"description": "Test slice number one.",
"serviceClass": 1,
"enabled": true,
"site": 10,
"omf_friendly": false,
- "subnet_id": null,
"slice_url": "",
"creator": null,
"enacted": null
@@ -1149,19 +1098,15 @@
"pk": 15,
"model": "core.slice",
"fields": {
- "router_id": null,
"updated": "2013-12-18T22:22:04.676Z",
"name": "test2",
"service": null,
"created": "2013-12-13T22:00:03.049Z",
- "network_id": null,
- "tenant_id": "",
"description": "test slice number two.",
"serviceClass": 1,
"enabled": true,
"site": 10,
"omf_friendly": false,
- "subnet_id": null,
"slice_url": "",
"creator": null,
"enacted": null