Rename syndicate to syndicate_storage
diff --git a/planetstack/core/dashboard/views/view_common.py b/planetstack/core/dashboard/views/view_common.py
index db842cb..f6386f5 100644
--- a/planetstack/core/dashboard/views/view_common.py
+++ b/planetstack/core/dashboard/views/view_common.py
@@ -4,7 +4,7 @@
import datetime
from pprint import pprint
import json
-from syndicate.models import *
+from syndicate_storage.models import *
from core.models import *
from hpc.models import ContentProvider
from operator import attrgetter
diff --git a/planetstack/core/fixtures/demo_data.json b/planetstack/core/fixtures/demo_data.json
index adeea1d..7c44ce3 100644
--- a/planetstack/core/fixtures/demo_data.json
+++ b/planetstack/core/fixtures/demo_data.json
@@ -51052,18 +51052,20 @@
},
{
"pk": 5,
- "model": "syndicate.syndicateservice",
+ "model": "syndicate_storage.syndicateservice",
"fields": {}
},
{
"pk": 1,
- "model": "syndicate.volume",
+ "model": "syndicate_storage.volume",
"fields": {
"updated": "2013-12-11T23:57:20.727Z",
"description": "GenBank dataset snapshot from Nov. 2013",
"created": "2013-12-11T23:57:20.727Z",
"blocksize": 61440,
- "default_gateway_caps": "3",
+ "cap_read_data": true,
+ "cap_write_data": false,
+ "cap_host_data": false,
"private": false,
"name": "GenBank-11-2013",
"enacted": null,
@@ -51073,13 +51075,15 @@
},
{
"pk": 2,
- "model": "syndicate.volume",
+ "model": "syndicate_storage.volume",
"fields": {
"updated": "2013-12-11T23:57:20.727Z",
"description": "Volume associated with princeton_syndicate",
"created": "2013-12-11T23:57:20.727Z",
- "blocksize": 102400,
- "default_gateway_caps": "31",
+ "blocksize": 102400,
+ "cap_read_data": true,
+ "cap_write_data": true,
+ "cap_host_data": true,
"private": true,
"name": "princeton_syndicate-Volume",
"enacted": null,
@@ -51089,13 +51093,15 @@
},
{
"pk": 3,
- "model": "syndicate.volume",
+ "model": "syndicate_storage.volume",
"fields": {
"updated": "2014-05-23T18:52:00.782Z",
"description": "LSST dataset",
"created": "2014-05-23T18:52:00.782Z",
"blocksize": 61440,
- "default_gateway_caps": "3",
+ "cap_read_data": true,
+ "cap_write_data": false,
+ "cap_host_data": false,
"private": false,
"name": "LSST",
"enacted": null,
@@ -51105,13 +51111,15 @@
},
{
"pk": 4,
- "model": "syndicate.volume",
+ "model": "syndicate_storage.volume",
"fields": {
"updated": "2014-05-23T18:52:53.617Z",
"description": "LHC dataset",
"created": "2014-05-23T18:52:53.617Z",
"blocksize": 61440,
- "default_gateway_caps": "3",
+ "cap_read_data": true,
+ "cap_write_data": false,
+ "cap_host_data": false,
"private": false,
"name": "LHC",
"enacted": null,
@@ -51121,13 +51129,15 @@
},
{
"pk": 5,
- "model": "syndicate.volume",
+ "model": "syndicate_storage.volume",
"fields": {
"updated": "2014-05-23T18:53:20.349Z",
"description": "NOAA dataset",
"created": "2014-05-23T18:53:20.349Z",
"blocksize": 61440,
- "default_gateway_caps": "3",
+ "cap_read_data": true,
+ "cap_write_data": false,
+ "cap_host_data": false,
"private": false,
"name": "NOAA",
"enacted": null,
@@ -51137,13 +51147,15 @@
},
{
"pk": 6,
- "model": "syndicate.volume",
+ "model": "syndicate_storage.volume",
"fields": {
"updated": "2014-05-23T18:53:56.495Z",
"description": "Measurement Lab dataset",
"created": "2014-05-23T18:53:56.495Z",
"blocksize": 61440,
- "default_gateway_caps": "3",
+ "cap_read_data": true,
+ "cap_write_data": false,
+ "cap_host_data": false,
"private": false,
"name": "Measurement Lab",
"enacted": null,
@@ -51153,13 +51165,15 @@
},
{
"pk": 7,
- "model": "syndicate.volume",
+ "model": "syndicate_storage.volume",
"fields": {
"updated": "2014-05-23T18:54:35.691Z",
"description": "Common Crawl dataset",
"created": "2014-05-23T18:54:35.691Z",
"blocksize": 61440,
- "default_gateway_caps": "3",
+ "cap_read_data": true,
+ "cap_write_data": false,
+ "cap_host_data": false,
"private": false,
"name": "Common Crawl",
"enacted": null,
@@ -51169,13 +51183,15 @@
},
{
"pk": 8,
- "model": "syndicate.volume",
+ "model": "syndicate_storage.volume",
"fields": {
"updated": "2014-05-27T14:05:41.026Z",
"description": "private volume for Analytics",
"created": "2014-05-27T14:05:41.025Z",
"blocksize": 61440,
- "default_gateway_caps": "7",
+ "cap_read_data": true,
+ "cap_write_data": true,
+ "cap_host_data": true,
"private": true,
"name": "private_Analytics",
"enacted": null,
@@ -51185,13 +51201,15 @@
},
{
"pk": 9,
- "model": "syndicate.volume",
+ "model": "syndicate_storage.volume",
"fields": {
"updated": "2014-05-29T22:00:50.320Z",
"description": "This is the bio5 demo volume",
"created": "2014-05-29T22:00:25.032Z",
"blocksize": 102400,
- "default_gateway_caps": "7",
+ "cap_read_data": true,
+ "cap_write_data": true,
+ "cap_host_data": true,
"private": true,
"name": "demo-bio5",
"enacted": null,
@@ -51201,42 +51219,48 @@
},
{
"pk": 1,
- "model": "syndicate.volumeaccessright",
+ "model": "syndicate_storage.volumeaccessright",
"fields": {
"updated": "2013-12-11T23:57:20.727Z",
"created": "2013-12-11T23:57:20.727Z",
"volume": 1,
- "gateway_caps": "3",
+ "cap_read_data": true,
+ "cap_write_data": false,
+ "cap_host_data": false,
"owner_id": 1,
"enacted": null
}
},
{
"pk": 1,
- "model": "syndicate.volumeslice",
+ "model": "syndicate_storage.volumeslice",
"fields": {
"updated": "2014-05-27T14:05:41.084Z",
"slice_id": 16,
"created": "2014-05-27T14:05:41.084Z",
- "peer_portnum": 1026,
- "gateway_caps": "3",
+ "UG_portnum": 1026,
+ "cap_read_data": true,
+ "cap_write_data": false,
+ "cap_host_data": false,
"volume_id": 8,
- "replicate_portnum": 1025,
+ "RG_portnum": 1025,
"credentials_blob": null,
"enacted": null
}
},
{
"pk": 2,
- "model": "syndicate.volumeslice",
+ "model": "syndicate_storage.volumeslice",
"fields": {
"updated": "2014-05-29T22:00:50.340Z",
"slice_id": 14,
"created": "2014-05-29T22:00:50.340Z",
- "peer_portnum": 4444,
- "gateway_caps": "7",
+ "UG_portnum": 4444,
+ "cap_read_data": true,
+ "cap_write_data": false,
+ "cap_host_data": false,
"volume_id": 9,
- "replicate_portnum": 5555,
+ "RG_portnum": 5555,
"credentials_blob": null,
"enacted": null
}
diff --git a/planetstack/core/fixtures/initial_data.json b/planetstack/core/fixtures/initial_data.json
index fdb02cb..531d5f9 100644
--- a/planetstack/core/fixtures/initial_data.json
+++ b/planetstack/core/fixtures/initial_data.json
@@ -49951,7 +49951,7 @@
},
{
"pk": 5,
- "model": "syndicate.syndicateservice",
+ "model": "syndicate_storage.syndicateservice",
"fields": {}
},
{
diff --git a/planetstack/planetstack/settings.py b/planetstack/planetstack/settings.py
index 8c5ff75..c9c4cf3 100644
--- a/planetstack/planetstack/settings.py
+++ b/planetstack/planetstack/settings.py
@@ -147,7 +147,7 @@
'cassandra',
'kairos',
'nagios',
- 'syndicate',
+ 'syndicate_storage',
'geoposition',
)
@@ -210,7 +210,7 @@
{'label': 'Users', 'icon':'icon-user', 'url': '/admin/core/user/'},
{'label': 'RequestRouter', 'icon':'icon-cog', 'app': 'requestrouter'},
{'label': 'HyperCache', 'icon':'icon-cog', 'app': 'hpc'},
- {'label': 'Syndicate', 'icon':'icon-cog', 'app': 'syndicate'},
+ {'label': 'Syndicate', 'icon':'icon-cog', 'app': 'syndicate_storage'},
{'label': 'Cassandra', 'icon':'icon-cog', 'app': 'cassandra'},
# {'label': 'KairosDB', 'icon':'icon-cog', 'app': 'kairos'},
# {'label': 'Nagios', 'icon':'icon-cog', 'app': 'nagios'},
diff --git a/planetstack/scripts/opencloud b/planetstack/scripts/opencloud
index d8e367a..2c5b14d 100755
--- a/planetstack/scripts/opencloud
+++ b/planetstack/scripts/opencloud
@@ -63,7 +63,7 @@
mkdir -p $BACKUP_DIR
FN="$BACKUP_DIR/dumpdata-`date +%Y-%m-%d_%H:%M:%S`.json"
echo "Saving data to $FN"
- python manage.py dumpdata core hpc syndicate requestrouter --indent 4 > $FN
+ python manage.py dumpdata core hpc syndicate_storage requestrouter --indent 4 > $FN
if [[ ! -f $FN ]]; then
echo "FAILED to create $FN"
exit