move syndicate observer to observers/syndicate
diff --git a/xos/syndicate_observer/__init__.py b/xos/observers/syndicate/__init__.py
similarity index 100%
rename from xos/syndicate_observer/__init__.py
rename to xos/observers/syndicate/__init__.py
diff --git a/xos/syndicate_observer/model-deps b/xos/observers/syndicate/model-deps
similarity index 100%
rename from xos/syndicate_observer/model-deps
rename to xos/observers/syndicate/model-deps
diff --git a/xos/syndicate_observer/requirements.py b/xos/observers/syndicate/requirements.py
similarity index 100%
rename from xos/syndicate_observer/requirements.py
rename to xos/observers/syndicate/requirements.py
diff --git a/xos/observers/syndicate/run.sh b/xos/observers/syndicate/run.sh
new file mode 100644
index 0000000..82960a9
--- /dev/null
+++ b/xos/observers/syndicate/run.sh
@@ -0,0 +1,2 @@
+export XOS_DIR=/opt/xos
+python syndicate-backend.py -C $XOS_DIR/observers/syndicate/syndicate_observer_config
diff --git a/xos/observers/syndicate/start.sh b/xos/observers/syndicate/start.sh
new file mode 100644
index 0000000..1c408a1
--- /dev/null
+++ b/xos/observers/syndicate/start.sh
@@ -0,0 +1,2 @@
+export XOS_DIR=/opt/xos
+nohup python syndicate-backend.py -C $XOS_DIR/observers/syndicate/syndicate_observer_config > /dev/null 2>&1 &
diff --git a/xos/syndicate_observer/steps/sync_volume.py b/xos/observers/syndicate/steps/sync_volume.py
similarity index 100%
rename from xos/syndicate_observer/steps/sync_volume.py
rename to xos/observers/syndicate/steps/sync_volume.py
diff --git a/xos/syndicate_observer/steps/sync_volumeaccessright.py b/xos/observers/syndicate/steps/sync_volumeaccessright.py
similarity index 100%
rename from xos/syndicate_observer/steps/sync_volumeaccessright.py
rename to xos/observers/syndicate/steps/sync_volumeaccessright.py
diff --git a/xos/syndicate_observer/steps/sync_volumeslice.py b/xos/observers/syndicate/steps/sync_volumeslice.py
similarity index 100%
rename from xos/syndicate_observer/steps/sync_volumeslice.py
rename to xos/observers/syndicate/steps/sync_volumeslice.py
diff --git a/xos/syndicate_observer/stop.sh b/xos/observers/syndicate/stop.sh
similarity index 100%
rename from xos/syndicate_observer/stop.sh
rename to xos/observers/syndicate/stop.sh
diff --git a/xos/syndicate_observer/syndicate-backend.py b/xos/observers/syndicate/syndicate-backend.py
similarity index 100%
rename from xos/syndicate_observer/syndicate-backend.py
rename to xos/observers/syndicate/syndicate-backend.py
diff --git a/xos/syndicate_observer/syndicate_observer_config b/xos/observers/syndicate/syndicate_observer_config
similarity index 72%
rename from xos/syndicate_observer/syndicate_observer_config
rename to xos/observers/syndicate/syndicate_observer_config
index 768f758..7e6d78a 100644
--- a/xos/syndicate_observer/syndicate_observer_config
+++ b/xos/observers/syndicate/syndicate_observer_config
@@ -24,9 +24,9 @@
nova_enabled=True
[observer]
-dependency_graph=/opt/xos/syndicate_observer/model-deps
-steps_dir=/opt/xos/syndicate_observer/steps
-deleters_dir=/opt/xos/syndicate_observer/deleters
+dependency_graph=/opt/xos/observers/syndicate/model-deps
+steps_dir=/opt/xos/observers/syndicate/steps
+deleters_dir=/opt/xos/observers/syndicate/deleters
log_file=console
driver=None
diff --git a/xos/syndicate_observer/syndicatelib.py b/xos/observers/syndicate/syndicatelib.py
similarity index 100%
rename from xos/syndicate_observer/syndicatelib.py
rename to xos/observers/syndicate/syndicatelib.py
diff --git a/xos/syndicate_observer/syndicatelib_config/__init__.py b/xos/observers/syndicate/syndicatelib_config/__init__.py
similarity index 100%
rename from xos/syndicate_observer/syndicatelib_config/__init__.py
rename to xos/observers/syndicate/syndicatelib_config/__init__.py
diff --git a/xos/syndicate_observer/syndicatelib_config/config-jude.py b/xos/observers/syndicate/syndicatelib_config/config-jude.py
similarity index 90%
rename from xos/syndicate_observer/syndicatelib_config/config-jude.py
rename to xos/observers/syndicate/syndicatelib_config/config-jude.py
index 81e7478..9e0f1fd 100644
--- a/xos/syndicate_observer/syndicatelib_config/config-jude.py
+++ b/xos/observers/syndicate/syndicatelib_config/config-jude.py
@@ -10,7 +10,7 @@
SYNDICATE_PYTHONPATH="/home/jude/Desktop/research/git/syndicate/build/out/python"
-SYNDICATE_PRIVATE_KEY="/home/jude/Desktop/research/git/syndicate/opencloud/syndicate_observer/syndicatelib_config/pollserver.pem"
+SYNDICATE_PRIVATE_KEY="/home/jude/Desktop/research/git/syndicate/opencloud/observers/syndicate/syndicatelib_config/pollserver.pem"
SYNDICATE_OPENCLOUD_SECRET="e4988309a5005edb8ea185f16f607938c0fb7657e4d7609853bcb7c4884d1c92"
SYNDICATE_HTTP_PORT=65321
diff --git a/xos/syndicate_observer/syndicatelib_config/config-opencloud.py b/xos/observers/syndicate/syndicatelib_config/config-opencloud.py
similarity index 97%
rename from xos/syndicate_observer/syndicatelib_config/config-opencloud.py
rename to xos/observers/syndicate/syndicatelib_config/config-opencloud.py
index 3cd2950..b3add16 100644
--- a/xos/syndicate_observer/syndicatelib_config/config-opencloud.py
+++ b/xos/observers/syndicate/syndicatelib_config/config-opencloud.py
@@ -36,7 +36,7 @@
# This is the location of the observer's private key. It must be an absolute
# path, and refer to a 4096-bit PEM-encoded RSA key.
-SYNDICATE_PRIVATE_KEY="/opt/xos/syndicate_observer/syndicatelib_config/pollserver.pem"
+SYNDICATE_PRIVATE_KEY="/opt/xos/observers/syndicate/syndicatelib_config/pollserver.pem"
# This is the master secret used to generate secrets to seal sensitive information sent to the
# Syndicate instance mount daemons. It is also used to seal sensitive information
diff --git a/xos/syndicate_observer/syndicatelib_config/config.py b/xos/observers/syndicate/syndicatelib_config/config.py
similarity index 97%
rename from xos/syndicate_observer/syndicatelib_config/config.py
rename to xos/observers/syndicate/syndicatelib_config/config.py
index 3cd2950..b3add16 100644
--- a/xos/syndicate_observer/syndicatelib_config/config.py
+++ b/xos/observers/syndicate/syndicatelib_config/config.py
@@ -36,7 +36,7 @@
# This is the location of the observer's private key. It must be an absolute
# path, and refer to a 4096-bit PEM-encoded RSA key.
-SYNDICATE_PRIVATE_KEY="/opt/xos/syndicate_observer/syndicatelib_config/pollserver.pem"
+SYNDICATE_PRIVATE_KEY="/opt/xos/observers/syndicate/syndicatelib_config/pollserver.pem"
# This is the master secret used to generate secrets to seal sensitive information sent to the
# Syndicate instance mount daemons. It is also used to seal sensitive information
diff --git a/xos/syndicate_observer/syndicatelib_config/pollserver.pem b/xos/observers/syndicate/syndicatelib_config/pollserver.pem
similarity index 100%
rename from xos/syndicate_observer/syndicatelib_config/pollserver.pem
rename to xos/observers/syndicate/syndicatelib_config/pollserver.pem
diff --git a/xos/services/syndicate_storage/models.py b/xos/services/syndicate_storage/models.py
index e2f98be..27db059 100644
--- a/xos/services/syndicate_storage/models.py
+++ b/xos/services/syndicate_storage/models.py
@@ -114,7 +114,7 @@
return secret_str
# otherwise, decrypt it
- from syndicate_observer import syndicatelib
+ from observers.syndicate import syndicatelib
# get observer private key
config = syndicatelib.get_config()
@@ -147,7 +147,7 @@
Encrypt the value with the Observer key
"""
- from syndicate_observer import syndicatelib
+ from observers.syndicate import syndicatelib
# get observer private key
config = syndicatelib.get_config()
@@ -236,7 +236,7 @@
Make sure a SliceSecret exists for this slice
"""
- from syndicate_observer import syndicatelib
+ from observers.syndicate import syndicatelib
# get observer private key
config = syndicatelib.get_config()
diff --git a/xos/syndicate_observer/run.sh b/xos/syndicate_observer/run.sh
deleted file mode 100644
index 824a248..0000000
--- a/xos/syndicate_observer/run.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export XOS_DIR=/opt/xos
-python syndicate-backend.py -C $XOS_DIR/syndicate_observer/syndicate_observer_config
diff --git a/xos/syndicate_observer/start.sh b/xos/syndicate_observer/start.sh
deleted file mode 100644
index 313d504..0000000
--- a/xos/syndicate_observer/start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export XOS_DIR=/opt/xos
-nohup python syndicate-backend.py -C $XOS_DIR/syndicate_observer/syndicate_observer_config > /dev/null 2>&1 &