diff options
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/auth-cass/src/main/cql/pull.sh | 9 | ||||
| -rw-r--r-- | auth/auth-cass/src/main/cql/push.sh | 11 | ||||
| -rw-r--r-- | auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtifactShow.java | 4 | ||||
| -rw-r--r-- | auth/docker/agent.sh | 12 |
4 files changed, 22 insertions, 14 deletions
diff --git a/auth/auth-cass/src/main/cql/pull.sh b/auth/auth-cass/src/main/cql/pull.sh index f4db573a..01fa52bf 100644 --- a/auth/auth-cass/src/main/cql/pull.sh +++ b/auth/auth-cass/src/main/cql/pull.sh @@ -1,5 +1,10 @@ -for T in x509 ns_attrib config cred user_role perm role artifact ns; do +mkdir -p dats +cd dats +for T in ns ns_attrib cred user_role perm role config artifact ; do cqlsh -e "use authz; COPY $T TO '$T.dat' WITH DELIMITER='|';" done -tar -cvzf dat.gz *.dat +tar -cvzf ../dat.gz *.dat +rm *.dat +cd - +rmdir dats diff --git a/auth/auth-cass/src/main/cql/push.sh b/auth/auth-cass/src/main/cql/push.sh index 8026c9f9..330326d5 100644 --- a/auth/auth-cass/src/main/cql/push.sh +++ b/auth/auth-cass/src/main/cql/push.sh @@ -1,5 +1,8 @@ -tar -xvf dat.gz -for T in x509 ns_attrib config cred user_role perm role artifact ns; do - cqlsh -e "use authz; COPY $T FROM '$T.dat' WITH DELIMITER='|';" +mkdir -p dats +cd dats +tar -xvf ../dat.gz +for T in $(ls *.dat); do + cqlsh -e "use authz; COPY ${T%.dat} FROM '$T' WITH DELIMITER='|';" done - +cd - +rm -Rf dats diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtifactShow.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtifactShow.java index d423731a..6d4e167a 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtifactShow.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtifactShow.java @@ -102,7 +102,7 @@ public class CMArtifactShow extends Page { "&machine='+machine.value,'_self');" ).end(js); hgen.leaf("input","id=machine","style=margin:1em 1em 1em 1em;width:30%").end(); - hgen.leaf(HTMLGen.A,"class=greenbutton","href=javascript:newArtifact()","style=color:white;").text("New Machine").end(); + hgen.leaf(HTMLGen.A,"class=greenbutton","href=javascript:newArtifact()","style=color:white;").text("New FQDN").end(); } }); } @@ -146,7 +146,7 @@ public class CMArtifactShow extends Page { this.sc = sc; } - private static final String[] headers = new String[]{"Machine","Directory","CA","Renews","Expires",""}; + private static final String[] headers = new String[]{"FQDN","Directory","CA","Renews","Expires",""}; @Override public String[] headers() { return headers; diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh index aa3db663..eb0bf3aa 100644 --- a/auth/docker/agent.sh +++ b/auth/docker/agent.sh @@ -40,11 +40,11 @@ done . ./aaf.props # Need AAF_FQDN's IP, because not might not be available in mini-container -if [ "$AAF_AAF_FQDN_IP" = "" ]; then - AAF_AAF_FQDN_IP=$(host $AAF_FQDN | grep "has address" | tail -1 | cut -f 4 -d ' ') - if [ "$AAF_AAF_FQDN_IP" = "" ]; then - read -p "IP of $AAF_FQDN: " AAF_AAF_FQDN_IP - echo "AAF_AAF_FQDN_IP=$AAF_AAF_FQDN_IP" >> ./aaf.props +if [ "$AAF_FQDN_IP" = "" ]; then + AAF_FQDN_IP=$(host $AAF_FQDN | grep "has address" | tail -1 | cut -f 4 -d ' ') + if [ "$AAF_FQDN_IP" = "" ]; then + read -p "IP of $AAF_FQDN: " AAF_FQDN_IP + echo "AAF_FQDN_IP=$AAF_FQDN_IP" >> ./aaf.props fi fi @@ -58,7 +58,7 @@ docker run \ -it \ --rm \ --mount 'type=volume,src='${VOLUME}',dst=/opt/app/osaaf,volume-driver='${DRIVER} \ - --add-host="$AAF_FQDN:$AAF_AAF_FQDN_IP" \ + --add-host="$AAF_FQDN:$AAF_FQDN_IP" \ --env AAF_FQDN=${AAF_FQDN} \ --env DEPLOY_FQI=${DEPLOY_FQI} \ --env DEPLOY_PASSWORD=${DEPLOY_PASSWORD} \ |