From: Instrumental <jcgmisc@stl.gathman.org>
Date: Fri, 6 Apr 2018 14:27:50 +0000 (-0500)
Subject: CQL changes
X-Git-Tag: Beijing-2.1.1~147^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F41383%2F1;p=aaf%2Fauthz.git

CQL changes

Issue-ID: AAF-213
Change-Id: Ib40a84f4af26791812e4bd0b5aea0564f8ba7bda
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
---

diff --git a/auth/auth-cass/docker/dbash b/auth/auth-cass/docker/dbash.sh
similarity index 100%
rename from auth/auth-cass/docker/dbash
rename to auth/auth-cass/docker/dbash.sh
diff --git a/auth/auth-cass/docker/dinstall b/auth/auth-cass/docker/dinstall.sh
similarity index 91%
rename from auth/auth-cass/docker/dinstall
rename to auth/auth-cass/docker/dinstall.sh
index aaa507b7..9362896d 100644
--- a/auth/auth-cass/docker/dinstall
+++ b/auth/auth-cass/docker/dinstall.sh
@@ -1,10 +1,12 @@
 #!/bin/bash dinstall
 if ["`docker ps -a | grep aaf_cass`" == ""]; then
   docker run --name aaf_cass  -d cassandra:3.11
-else 
+  echo "Check for running Docker Container aaf_cass, then run again."
+  exit
+else
   docker exec aaf_cass mkdir -p /opt/app/cass_init
   docker cp "../src/main/cql/." aaf_cass:/opt/app/cass_init
-fi
+fi 
 
 echo "Docker Installed Basic Cassandra on aaf_cass.  Executing the following "
 echo "NOTE: This creator provided is only a Single Instance. For more complex Cassandra, create independently"
@@ -16,7 +18,7 @@ echo " cqlsh -u root -p root -f osaaf.cql"
 echo ""
 echo "The following will give you a temporary identity with which to start working, or emergency"
 echo " cqlsh -u root -p root -f temp_identity.cql"
-echo "Sleeping 10 seconds to allow Cassandra to start"
+echo "Sleeping for 10 seconds"
 sleep 10
 docker exec -it aaf_cass bash -c '\
 cd /opt/app/cass_init; \
diff --git a/auth/auth-cass/src/main/cql/keyspace.cql b/auth/auth-cass/src/main/cql/keyspace.cql
index ad58090f..52dc5ea7 100644
--- a/auth/auth-cass/src/main/cql/keyspace.cql
+++ b/auth/auth-cass/src/main/cql/keyspace.cql
@@ -1,9 +1,11 @@
 // For Developer Machine single instance
-CREATE KEYSPACE authz
-  WITH REPLICATION = {'class' : 'SimpleStrategy','replication_factor':1};
+// CREATE KEYSPACE authz
+//  WITH REPLICATION = {'class' : 'SimpleStrategy','replication_factor':1};
 // 
 //
  
 // Example of Network Topology, with Datacenter dc1 & dc2
 // CREATE KEYSPACE authz WITH replication = { 'class': 'NetworkTopologyStrategy', 'dc1': '2', 'dc2': '2' };
+// Out of the box Docker Cassandra comes with "datacenter1", one instance
+CREATE KEYSPACE authz WITH replication = { 'class': 'NetworkTopologyStrategy', 'datacenter1': '1' };
 // 
diff --git a/auth/docker/d.props b/auth/docker/d.props
index 90bc5511..6fc232ee 100644
--- a/auth/docker/d.props
+++ b/auth/docker/d.props
@@ -8,6 +8,6 @@ CONF_ROOT_DIR=/opt/app/osaaf
 # Local Env info
 HOSTNAME=meriadoc.mithril.sbc.com
 HOST_IP=172.17.0.3
-CASS_HOST="cass.aaf.osaaf.org:172.17.0.2"
+CASS_HOST=cass.aaf.osaaf.org:172.17.0.2
 
 
diff --git a/auth/docker/dbash.sh b/auth/docker/dbash.sh
index da166b5c..642cba40 100644
--- a/auth/docker/dbash.sh
+++ b/auth/docker/dbash.sh
@@ -1 +1 @@
-docker exec -it aaf bash
\ No newline at end of file
+docker exec -it aaf_$1 bash
diff --git a/auth/docker/dstart.sh b/auth/docker/dstart.sh
new file mode 100644
index 00000000..9fcc328b
--- /dev/null
+++ b/auth/docker/dstart.sh
@@ -0,0 +1,12 @@
+#!/bin/bash dstop.sh
+. d.props
+
+if [ "$1" == "" ]; then
+  AAF_COMPONENTS=`ls -r ../aaf_${VERSION}/bin | grep -v '\.'`
+else
+  AAF_COMPONENTS=$1
+fi
+
+for AAF_COMPONENT in ${AAF_COMPONENTS}; do
+  docker start aaf_$AAF_COMPONENT
+done