From e9ae0a166019675b383cd8cc5d0c591846267518 Mon Sep 17 00:00:00 2001 From: "Eran (ev672n), Vosk" Date: Tue, 7 Aug 2018 20:53:11 +0300 Subject: adding the dcae dt code Adding DCAE-dt code Change-Id: Ia349ec9fcec2820cb81695144b59a3a557d7a0d4 Issue-ID: SDC-1614 Signed-off-by: Eran (ev672n), Vosk --- .bowerrc | 5 -- Dockerfile | 26 --------- app/grep.sh | 53 ------------------ app/index.html | 25 --------- .../cookbooks/dcae-dt/files/default/keystore | Bin 4255 -> 0 bytes .../cookbooks/dcae-dt/files/default/truststore | Bin 4255 -> 0 bytes docker/scripts/set_dockerfile_and_pom.pl | 62 --------------------- 7 files changed, 171 deletions(-) delete mode 100644 .bowerrc delete mode 100644 Dockerfile delete mode 100755 app/grep.sh delete mode 100644 docker/chef-solo/cookbooks/dcae-dt/files/default/keystore delete mode 100644 docker/chef-solo/cookbooks/dcae-dt/files/default/truststore delete mode 100644 docker/scripts/set_dockerfile_and_pom.pl diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index e98c83d..0000000 --- a/.bowerrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "directory": "bower_components", - "proxy":"http://one.proxy.att.com:8080", - "https-proxy":"http://one.proxy.att.com:8080" -} diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 9c2fe6a..0000000 --- a/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM dockercentral.it.att.com:5100/com.att.sdc/base_sdc-jetty:1.2.0-SNAPSHOT-latest - -COPY docker/chef-solo /var/opt/dcae-dt/chef-solo/ - -COPY docker/startup.sh /var/opt/dcae-dt/ - -ADD target/dcae-dt.war ${JETTY_BASE}/webapps/ - -USER root - -RUN mkdir -p /opt/logs/dcae-dt - -COPY docker/set_user.sh /tmp/set_user.sh - -RUN sh -x /tmp/set_user.sh && rm -f /tmp/set_user.sh - -RUN chown -R jetty:jetty ${JETTY_BASE}/webapps /var/opt/dcae-dt /opt/logs /var/lib/jetty - -RUN chmod 770 /var/opt/dcae-dt/startup.sh - -EXPOSE 8186 9446 - -USER jetty - -ENTRYPOINT [ "/var/opt/dcae-dt/startup.sh" ] - diff --git a/app/grep.sh b/app/grep.sh deleted file mode 100755 index 40c2c7a..0000000 --- a/app/grep.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -clear - -echo "Create grep-logs folder for txt files" -mkdir -p grep-logs - -echo "Producing AIC-grep.txt" -grep -riHI --exclude=AIC-grep.txt "aic" ./ | grep -vI --exclude=AIC-grep.txt "AiC" | grep -vI --exclude=AIC-grep.txt "aaico" >> grep-logs/AIC-grep.txt - -echo "Producing amdocs-grep.txt" -grep -riHI --exclude=amdocs-grep.txt "amdocs" >> grep-logs/amdocs-grep.txt - -echo "Producing att-grep.txt" -grep -riH --exclude=att-grep.txt " att " ./ | grep -vI --exclude=att-grep.txt "collector\.log" | grep -vI --exclude=att-grep.txt "Canvas.prototype.zoom = function(newScale, center) " >> grep-logs/att-grep.txt - -echo "Producing attuid-grep.txt" -grep -rHI --exclude=attuid-grep.txt " [a-zA-Z][a-zA-Z][0-9][0-9][0-9][0-9a-zA-Z] " >> grep-logs/attuid-grep.txt - -echo "Producing comatt-grep.txt" -grep -riHI --exclude=comatt-grep.txt "com.att" >> grep-logs/comatt-grep.txt - -echo "Producing ecomp-grep.txt" -grep -riHI --exclude=ecomp-grep.txt "ecomp" | grep -viI --exclude=ecomp-grep.txt "opene" >> grep-logs/ecomp-grep.txt - -echo "Producing nfod-grep.txt" -grep -riHI --exclude=nfod-grep.txt 'Network On Demand' >> grep-logs/nfod-grep.txt - -echo "Producing ngeag-grep.txt" -grep -riHI --exclude=ngeag-grep.txt 'ngeag' >> grep-logs/ngeag-grep.txt - -echo "Producing public12-ip-grep.txt" -grep -rEI --exclude=public12-ip-grep.txt '12\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' >> grep-logs/public12-ip-grep.txt - -echo "Producing public135-ip-grep.txt" -grep -rEI --exclude=public135-ip-grep.txt '135\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' >> grep-logs/public135-ip-grep.txt - -echo "Producing public172-99-ip-grep.txt" -grep -riHI --exclude=public172-99-ip-grep.txt "172\.99" >> grep-logs/public172-99-ip-grep.txt - -echo "Producing research-com-att-grep.txt" -grep -riHI --exclude=research-com-att-grep.txt "research\.att\.com" >> grep-logs/research-com-att-grep.txt - -echo "Producing sbc-grep.txt" -grep -riHI --exclude=sbc-grep.txt "sbc" >> grep-logs/sbc-grep.txt - -echo "Producing sbc-com-grep.txt" -grep -riHI --exclude=sbc-com-grep.txt "sbc\.com" >> grep-logs/sbc-com-grep.txt - -echo "Producing ucpe-grep.txt" -grep -riHI --exclude=ucpe-grep.txt "ucpe" >> grep-logs/ucpe-grep.txt - -echo "Finished greppppp!!!!" - diff --git a/app/index.html b/app/index.html index 17f6ae0..fa97ba1 100644 --- a/app/index.html +++ b/app/index.html @@ -163,31 +163,6 @@ document.getElementById("content-container").style.marginLeft = "0"; } - - - - - - - diff --git a/docker/chef-solo/cookbooks/dcae-dt/files/default/keystore b/docker/chef-solo/cookbooks/dcae-dt/files/default/keystore deleted file mode 100644 index c408393..0000000 Binary files a/docker/chef-solo/cookbooks/dcae-dt/files/default/keystore and /dev/null differ diff --git a/docker/chef-solo/cookbooks/dcae-dt/files/default/truststore b/docker/chef-solo/cookbooks/dcae-dt/files/default/truststore deleted file mode 100644 index c408393..0000000 Binary files a/docker/chef-solo/cookbooks/dcae-dt/files/default/truststore and /dev/null differ diff --git a/docker/scripts/set_dockerfile_and_pom.pl b/docker/scripts/set_dockerfile_and_pom.pl deleted file mode 100644 index 8411f30..0000000 --- a/docker/scripts/set_dockerfile_and_pom.pl +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - - -my @lines; - -# -### POM file -# - -my $file = 'pom.xml'; -### Read the pom.xml file. -open (POM, $file) or die "[ERROR] Cannot read the file '$file' : $!\n\n"; -chomp (@lines = ); -close (POM); - -open (NEW, ">${file}") or die "[ERROR] Cannot write to the file '$file' : $!\n\n"; -foreach my $line (@lines) { - - # Replace groupID - if ($line =~ m|org.onap.sdc|) { - $line =~ s|org.onap.sdc|com.att.sdc|; - } - - # Remove the tags. - if ($line =~ m|(.*)|) { - - if ($1 eq '${docker.tag}') { - $line =~ s|\$\{docker.tag\}|\$\{project.version\}|; - } - else { - next; - } - } - - print NEW "$line\n"; -} -close (NEW); - - -# -### Dockerfie -# - -my $dockerFile = 'Dockerfile'; - -open (FILE, $dockerFile) or die "[ERROR] Cannot read the file '$dockerFile' : $!\n\n"; -chomp (@lines = ); -close (FILE); - -open (NEW, ">${dockerFile}") or die "[ERROR] Cannot write to the file '$dockerFile' : $!\n\n"; - -foreach my $line (@lines) { - # Replace the docker registry - if ($line =~ m|FROM|) { - $line =~ s|onap|dockercentral.it.att.com:5100/com.att.sdc|; - } - print NEW "$line\n"; -} -close (NEW); -- cgit 1.2.3-korg