From 1f18e460ca08b54a47993ddcce7934012c85f60a Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Tue, 1 Aug 2017 15:06:44 -0400 Subject: Move poms/scripts from OpenECOMP to ONAP Change-Id: I733aa812860e5126ffbf1242780006a611e0a694 Signed-off-by: Marco Platania --- vnfs/vLB/DNSClient/pom.xml | 4 ++-- vnfs/vLB/DNSManager/pom.xml | 4 ++-- vnfs/vLB/dns_streams/pom.xml | 4 ++-- vnfs/vLB/scripts/db_dnsdemo_onap_org | 24 ++++++++++++++++++++++++ vnfs/vLB/scripts/named.conf.local | 4 ++-- vnfs/vLB/scripts/v_dns_install.sh | 18 +++++++++--------- vnfs/vLB/scripts/v_lb_install.sh | 16 ++++++++-------- vnfs/vLB/scripts/v_packetgen_install.sh | 12 ++++++------ 8 files changed, 55 insertions(+), 31 deletions(-) create mode 100644 vnfs/vLB/scripts/db_dnsdemo_onap_org (limited to 'vnfs/vLB') diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml index d4d60f8d..cd746b7b 100644 --- a/vnfs/vLB/DNSClient/pom.xml +++ b/vnfs/vLB/DNSClient/pom.xml @@ -26,14 +26,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.openecomp.demo.vnf + org.onap.demo.vnf demo-aggregator 1.1.0-SNAPSHOT ../../../pom.xml 4.0.0 - org.openecomp.demo.vnf.vlb + org.onap.demo.vnf.vlb dns-client DNS Client jar diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml index 2dda1f82..4d837b25 100644 --- a/vnfs/vLB/DNSManager/pom.xml +++ b/vnfs/vLB/DNSManager/pom.xml @@ -26,14 +26,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.openecomp.demo.vnf + org.onap.demo.vnf demo-aggregator 1.1.0-SNAPSHOT ../../../pom.xml 4.0.0 - org.openecomp.demo.vnf.vlb + org.onap.demo.vnf.vlb dns-manager DNS Manager jar diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml index 8a508f60..ca758f8e 100644 --- a/vnfs/vLB/dns_streams/pom.xml +++ b/vnfs/vLB/dns_streams/pom.xml @@ -26,14 +26,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.openecomp.demo.vnf + org.onap.demo.vnf demo-aggregator 1.1.0-SNAPSHOT ../../../pom.xml 4.0.0 - org.openecomp.demo.vnf.vlb + org.onap.demo.vnf.vlb vlb_dns_streams diff --git a/vnfs/vLB/scripts/db_dnsdemo_onap_org b/vnfs/vLB/scripts/db_dnsdemo_onap_org new file mode 100644 index 00000000..45da8164 --- /dev/null +++ b/vnfs/vLB/scripts/db_dnsdemo_onap_org @@ -0,0 +1,24 @@ +; +; BIND data file for local loopback interface +; +$TTL 604800 +@ IN SOA dnsdemo.onap.org. admin.dnsdemo.onap.org. ( + 3 ; Serial + 604800 ; Refresh + 86400 ; Retry + 2419200 ; Expire + 604800 ) ; Negative Cache TTL +; name servers - NS records + IN NS dnsdemo.onap.org. +; name servers - A records +dnsdemo.onap.org. IN A 10.0.100.100 +host1.dnsdemo.onap.org. IN A 10.0.100.101 +host2.dnsdemo.onap.org. IN A 10.0.100.102 +host3.dnsdemo.onap.org. IN A 10.0.100.103 +host4.dnsdemo.onap.org. IN A 10.0.100.104 +host5.dnsdemo.onap.org. IN A 10.0.100.105 +host6.dnsdemo.onap.org. IN A 10.0.100.106 +host7.dnsdemo.onap.org. IN A 10.0.100.107 +host8.dnsdemo.onap.org. IN A 10.0.100.108 +host9.dnsdemo.onap.org. IN A 10.0.100.109 +host10.dnsdemo.onap.org. IN A 10.0.100.110 diff --git a/vnfs/vLB/scripts/named.conf.local b/vnfs/vLB/scripts/named.conf.local index 1b5c9f01..94f8ad29 100644 --- a/vnfs/vLB/scripts/named.conf.local +++ b/vnfs/vLB/scripts/named.conf.local @@ -6,7 +6,7 @@ // organization //include "/etc/bind/zones.rfc1918"; -zone "dnsdemo.openecomp.org" { +zone "dnsdemo.onap.org" { type master; - file "/etc/bind/zones/db.dnsdemo.openecomp.org"; # zone file path + file "/etc/bind/zones/db.dnsdemo.onap.org"; # zone file path }; diff --git a/vnfs/vLB/scripts/v_dns_install.sh b/vnfs/vLB/scripts/v_dns_install.sh index 5e51ee2c..83441ac9 100644 --- a/vnfs/vLB/scripts/v_dns_install.sh +++ b/vnfs/vLB/scripts/v_dns_install.sh @@ -58,11 +58,11 @@ mkdir /opt/config mkdir /opt/FDclient cd /opt -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_dns_init.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vdns.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/dnsclient.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/set_gre_tunnel.sh -wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/vlb/dns-client/$DEMO_ARTIFACTS_VERSION/dns-client-$DEMO_ARTIFACTS_VERSION.jar +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_dns_init.sh +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vdns.sh +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/dnsclient.sh +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/set_gre_tunnel.sh +wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/dns-client/$DEMO_ARTIFACTS_VERSION/dns-client-$DEMO_ARTIFACTS_VERSION.jar mv dns-client-$DEMO_ARTIFACTS_VERSION.jar /opt/FDclient/ mv dnsclient.sh /opt/FDclient/ @@ -75,15 +75,15 @@ chmod +x /opt/FDclient/set_gre_tunnel.sh # Download Bind config files cd /opt/config -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/db_dnsdemo_openecomp_org -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/named.conf.options -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/named.conf.local +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/db_dnsdemo_onap_org +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/named.conf.options +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/named.conf.local # Configure Bind modprobe ip_gre mkdir /etc/bind/zones sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9 -mv db_dnsdemo_openecomp_org /etc/bind/zones/db.dnsdemo.openecomp.org +mv db_dnsdemo_onap_org /etc/bind/zones/db.dnsdemo.onap.org mv named.conf.options /etc/bind/ mv named.conf.local /etc/bind/ sleep 1 diff --git a/vnfs/vLB/scripts/v_lb_install.sh b/vnfs/vLB/scripts/v_lb_install.sh index da1c5b41..394a6c8c 100644 --- a/vnfs/vLB/scripts/v_lb_install.sh +++ b/vnfs/vLB/scripts/v_lb_install.sh @@ -58,14 +58,14 @@ mkdir /opt/config mkdir /opt/FDserver cd /opt -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_lb_init.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vlb.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/dnsmembership.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/add_dns.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/remove_dns.sh -wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/vlb/dns-manager/$DEMO_ARTIFACTS_VERSION/dns-manager-$DEMO_ARTIFACTS_VERSION.jar -wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz -wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/ves/ves_vlb_reporting/$DEMO_ARTIFACTS_VERSION/ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_lb_init.sh +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vlb.sh +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/dnsmembership.sh +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/add_dns.sh +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/remove_dns.sh +wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/dns-manager/$DEMO_ARTIFACTS_VERSION/dns-manager-$DEMO_ARTIFACTS_VERSION.jar +wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/ves_vlb_reporting/$DEMO_ARTIFACTS_VERSION/ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz tar -zxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz mv ves-$DEMO_ARTIFACTS_VERSION VES diff --git a/vnfs/vLB/scripts/v_packetgen_install.sh b/vnfs/vLB/scripts/v_packetgen_install.sh index e48e9be5..2a2d7a24 100644 --- a/vnfs/vLB/scripts/v_packetgen_install.sh +++ b/vnfs/vLB/scripts/v_packetgen_install.sh @@ -26,12 +26,12 @@ pip install jsonschema mkdir /opt/config mkdir /opt/honeycomb cd /opt -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_packetgen_for_dns_demo_init.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vpacketgenfordnsdemo.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/run_streams_dns.sh -wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vdnspacketgen_change_streams_ports.sh -wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz -wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/vlb/vlb_dns_streams/$DEMO_ARTIFACTS_VERSION/vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_packetgen_for_dns_demo_init.sh +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vpacketgenfordnsdemo.sh +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/run_streams_dns.sh +wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vdnspacketgen_change_streams_ports.sh +wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz +wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/vlb_dns_streams/$DEMO_ARTIFACTS_VERSION/vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz tar -zxvf vpp.tar.gz tar -zxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz -- cgit 1.2.3-korg