Remove unused stuff from demo repository 58/87258/1
authorMarco Platania <platania@research.att.com>
Wed, 8 May 2019 17:49:41 +0000 (13:49 -0400)
committerMarco Platania <platania@research.att.com>
Wed, 8 May 2019 17:49:41 +0000 (13:49 -0400)
Change-Id: Icc2b2b74a3db494ecc9cf596eb70eea15a447af9
Issue-ID: INT-1073
Signed-off-by: Marco Platania <platania@research.att.com>
40 files changed:
boot/.gitkeep [deleted file]
boot/assembly.xml [deleted file]
boot/bind_options [deleted file]
boot/bind_zones [deleted file]
boot/bind_zones_onap [deleted file]
boot/db_simpledemo_onap_org [deleted file]
boot/db_simpledemo_openecomp_org [deleted file]
boot/dcae2_vm_init.sh [deleted file]
boot/esr_vm_init.sh [deleted file]
boot/msb_vm_init.sh [deleted file]
boot/multiserv_all_serv.sh [deleted file]
boot/mvim_vm_init.sh [deleted file]
boot/named.conf.local [deleted file]
boot/named.conf.options [deleted file]
boot/pom.xml [deleted file]
boot/sdc_ext_volume_partitions.txt [deleted file]
boot/uui_vm_init.sh [deleted file]
boot/vfc_vm_init.sh [deleted file]
boot/vnfsdk_vm_init.sh [deleted file]
docker_upgrade_scripts/README.md [deleted file]
docker_upgrade_scripts/fabfile.py [deleted file]
docker_upgrade_scripts/onap_docker_upgrade.conf [deleted file]
docker_upgrade_scripts/onap_docker_upgrade.py [deleted file]
pom.xml
scripts/deploy.sh [deleted file]
vnfs/honeycomb_plugin/parent-pom/pom.xml
vnfs/honeycomb_plugin/sample-distribution/pom.xml [deleted file]
vnfs/honeycomb_plugin/sample-distribution/src/main/java/io/fd/honeycomb/tutorial/Main.java [deleted file]
vnfs/honeycomb_plugin/sample_plugin/LICENSE.TXT [deleted file]
vnfs/honeycomb_plugin/sample_plugin/README.md [deleted file]
vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml [deleted file]
vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/src/main/yang/sample-plugin.yang [deleted file]
vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/Readme.adoc [deleted file]
vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml [deleted file]
vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/Module.java [deleted file]
vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/ModuleConfiguration.java [deleted file]
vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/init/ConfigDataInitializer.java [deleted file]
vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/notif/SampleNotificationProducer.java [deleted file]
vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/write/ModuleWriterFactory.java [deleted file]
vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/write/PgWriteCustomizer.java [deleted file]

diff --git a/boot/.gitkeep b/boot/.gitkeep
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/boot/assembly.xml b/boot/assembly.xml
deleted file mode 100644 (file)
index 5b7217b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-  <id>boot</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${basedir}</directory>
-      <includes>
-        <include>**</include>
-      </includes>
-      <excludes>
-        <exclude>assembly.xml</exclude>
-        <exclude>pom.xml</exclude>
-        <exclude>target/</exclude>
-        <exclude>.*</exclude>
-      </excludes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/boot/bind_options b/boot/bind_options
deleted file mode 100644 (file)
index 857e2d2..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-acl "trusted" {
-        #x.x.x.x;
-};
-options {
-        directory "/var/cache/bind";
-
-        recursion yes;                # enables recursive queries
-        allow-recursion { any; };     # allows recursive queries from "trusted” clients i.e. LB only
-        listen-on { dns_ip_addr; };   # ns1 IP address - listen on this address only
-        allow-transfer { none; };      # disable zone transfers by default
-
-        forwarders {
-                dns_forwarder;
-        };
-
-        // If there is a firewall between you and nameservers you want
-        // to talk to, you may need to fix the firewall to allow multiple
-        // ports to talk.  See http://www.kb.cert.org/vuls/id/800113
-
-        // If your ISP provided one or more IP addresses for stable
-        // nameservers, you probably want to use them as forwarders.
-        // Uncomment the following block, and insert the addresses replacing
-        // the all-0's placeholder.
-
-        // forwarders {
-        //      0.0.0.0;
-        // };
-
-        //========================================================================
-        // If BIND logs error messages about the root key being expired,
-        // you will need to update your keys.  See https://www.isc.org/bind-keys
-        //========================================================================
-        dnssec-validation no;
-
-        auth-nxdomain no;    # conform to RFC1035
-        listen-on-v6 { any; };
-};
-
diff --git a/boot/bind_zones b/boot/bind_zones
deleted file mode 100644 (file)
index eebd208..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-;
-; BIND data file for local loopback interface
-;
-$TTL    604800
-@       IN      SOA     simpledemo.openecomp.org. admin.simpledemo.openecomp.org. (
-                        20170221        ; Serial
-                         604800         ; Refresh
-                          86400         ; Retry
-                        2419200         ; Expire
-                         604800 )       ; Negative Cache TTL
-;
-; name servers - NS records
-    IN      NS      simpledemo.openecomp.org.
-
-; name servers - A records
-simpledemo.openecomp.org.          IN      A       dns_ip_addr
-
-;
-vm1.aai.simpledemo.openecomp.org.       IN      A       aai1_ip_addr
-c1.vm1.aai.simpledemo.openecomp.org.    IN      A       aai1_ip_addr
-c2.vm1.aai.simpledemo.openecomp.org.    IN      A       aai1_ip_addr
-c3.vm1.aai.simpledemo.openecomp.org.    IN      A       aai1_ip_addr
-
-vm2.aai.simpledemo.openecomp.org.       IN      A       aai2_ip_addr
-c1.vm2.aai.simpledemo.openecomp.org.    IN      A       aai2_ip_addr
-c2.vm2.aai.simpledemo.openecomp.org.    IN      A       aai2_ip_addr
-c3.vm2.aai.simpledemo.openecomp.org.    IN      A       aai2_ip_addr
-
-vm1.appc.simpledemo.openecomp.org.      IN      A       appc_ip_addr
-c1.vm1.appc.simpledemo.openecomp.org.   IN      A       appc_ip_addr
-c2.vm1.appc.simpledemo.openecomp.org.   IN      A       appc_ip_addr
-
-vm1.sdc.simpledemo.openecomp.org.      IN      A       sdc_ip_addr
-c1.vm1.sdc.simpledemo.openecomp.org.   IN      A       sdc_ip_addr
-c2.vm1.sdc.simpledemo.openecomp.org.   IN      A       sdc_ip_addr
-c3.vm1.sdc.simpledemo.openecomp.org.   IN      A       sdc_ip_addr
-c4.vm1.sdc.simpledemo.openecomp.org.   IN      A       sdc_ip_addr
-
-vm1.dcae.simpledemo.openecomp.org.           IN      A       dcae_ip_addr
-c1.vm1.dcae.simpledemo.openecomp.org.        IN      A       dcae_ip_addr
-c2.vm1.dcae.simpledemo.openecomp.org.        IN      A       dcae_ip_addr
-c3.vm1.dcae.simpledemo.openecomp.org         IN      A       dcae_ip_addr
-
-vm1.mso.simpledemo.openecomp.org.       IN      A       so_ip_addr
-c1.vm1.mso.simpledemo.openecomp.org.    IN      A       so_ip_addr
-c1.vm1.mso.simpledemo.openecomp.org.    IN      A       so_ip_addr
-
-vm1.policy.simpledemo.openecomp.org.    IN      A       policy_ip_addr
-c1.vm1.policy.simpledemo.openecomp.org. IN      A       policy_ip_addr
-c2.vm1.policy.simpledemo.openecomp.org. IN      A       policy_ip_addr
-c3.vm1.policy.simpledemo.openecomp.org. IN      A       policy_ip_addr
-c4.vm1.policy.simpledemo.openecomp.org. IN      A       policy_ip_addr
-c5.vm1.policy.simpledemo.openecomp.org. IN      A       policy_ip_addr
-c6.vm1.policy.simpledemo.openecomp.org. IN      A       policy_ip_addr
-c7.vm1.policy.simpledemo.openecomp.org. IN      A       policy_ip_addr
-c8.vm1.policy.simpledemo.openecomp.org. IN      A       policy_ip_addr
-
-vm1.sdnc.simpledemo.openecomp.org.      IN      A       sdnc_ip_addr
-c1.vm1.sdnc.simpledemo.openecomp.org.   IN      A       sdnc_ip_addr
-c2.vm1.sdnc.simpledemo.openecomp.org.   IN      A       sdnc_ip_addr
-c3.vm1.sdnc.simpledemo.openecomp.org.   IN      A       sdnc_ip_addr
-c4.vm1.sdnc.simpledemo.openecomp.org.   IN      A       sdnc_ip_addr
-
-vm1.vid.simpledemo.openecomp.org.       IN      A       vid_ip_addr
-c1.vm1.vid.simpledemo.openecomp.org.    IN      A       vid_ip_addr
-c2.vm1.vid.simpledemo.openecomp.org.    IN      A       vid_ip_addr
-
-vm1.portal.simpledemo.openecomp.org.           IN      A       portal_ip_addr
-c1.vm1.portal.simpledemo.openecomp.org.        IN      A       portal_ip_addr
-c2.vm1.portal.simpledemo.openecomp.org.        IN      A       portal_ip_addr
-
-vm1.robot.simpledemo.openecomp.org.           IN      A       robot_ip_addr
-c1.vm1.robot.simpledemo.openecomp.org.        IN      A       robot_ip_addr
-c2.vm1.robot.simpledemo.openecomp.org.        IN      A       robot_ip_addr
-
-vm1.clamp.simpledemo.openecomp.org.           IN      A       clamp_ip_addr
-c1.vm1.clamp.simpledemo.openecomp.org.        IN      A       clamp_ip_addr
-c2.vm1.clamp.simpledemo.openecomp.org.        IN      A       clamp_ip_addr
-
-vm1.aaf.simpledemo.openecomp.org.      IN      A       aaf_ip_addr
-vm1.aaf-sms.simpledemo.openecomp.org.  IN      A       sms_ip_addr
-
-vm1.mr.simpledemo.openecomp.org.       IN      A       mr_ip_addr
-
-vm1.multiserv.simpledemo.openecomp.org. IN  A   multiserv_ip_addr
-
-vm1.music.simpledemo.openecomp.org. IN  A   music_ip_addr
-
-vm1.oof.simpledemo.openecomp.org. IN  A   oof_ip_addr
-
-vm1.nbi.simpledemo.openecomp.org. IN  A   nbi_ip_addr
-
-
-;CNAMES
-;A&AI
-aai.api.simpledemo.openecomp.org.      IN      CNAME   vm1.aai.simpledemo.openecomp.org.
-aai.ui.simpledemo.openecomp.org.    IN  CNAME   vm1.aai.simpledemo.openecomp.org.
-aai.searchservice.simpledemo.openecomp.org.     IN      CNAME   vm1.aai.simpledemo.openecomp.org.
-aai.hbase.simpledemo.openecomp.org.    IN      CNAME   vm2.aai.simpledemo.openecomp.org.
-aai.gremlinserver.simpledemo.openecomp.org.    IN      CNAME   vm2.aai.simpledemo.openecomp.org.
-aai.elasticsearch.simpledemo.openecomp.org.    IN      CNAME   vm2.aai.simpledemo.openecomp.org.
-
-;APPC
-appc.api.simpledemo.openecomp.org.     IN      CNAME   vm1.appc.simpledemo.openecomp.org.
-
-;ASDC
-sdc.api.simpledemo.openecomp.org.      IN      CNAME   vm1.sdc.simpledemo.openecomp.org.
-
-;DCAE
-dcae.api.simpledemo.openecomp.org.     IN      CNAME   vm1.dcae.simpledemo.openecomp.org.
-
-;SO
-mso.api.simpledemo.openecomp.org.      IN      CNAME   vm1.mso.simpledemo.openecomp.org.
-so.api.simpledemo.openecomp.org.       IN      CNAME   vm1.mso.simpledemo.openecomp.org.
-
-;Policy
-policy.api.simpledemo.openecomp.org.   IN      CNAME   vm1.policy.simpledemo.openecomp.org.
-
-;SDNC
-sdnc.api.simpledemo.openecomp.org.     IN      CNAME    vm1.sdnc.simpledemo.openecomp.org.
-
-;VID
-vid.api.simpledemo.openecomp.org.      IN      CNAME   vm1.vid.simpledemo.openecomp.org.
-
-;PORTAL
-portal.api.simpledemo.openecomp.org.   IN      CNAME   vm1.portal.simpledemo.openecomp.org.
-
-;Message Router
-;mr.api.simpledemo.openecomp.org.      IN      CNAME   vm1.mr.simpledemo.openecomp.org.
-ueb.api.simpledemo.openecomp.org.      IN      CNAME   vm1.mr.simpledemo.openecomp.org.
-;dbc.api.simpledemo.openecomp.org.     IN      CNAME   vm1.mr.simpledemo.openecomp.org.
-;drprov.api.simpledemo.openecomp.org.  IN      CNAME   vm1.mr.simpledemo.openecomp.org.
-
-;CLAMP
-clamp.api.simpledemo.openecomp.org.    IN      CNAME   vm1.clamp.simpledemo.openecomp.org.
-
-;ROBOT/SNIRO
-robot.api.simpledemo.openecomp.org.    IN      CNAME   vm1.robot.simpledemo.openecomp.org.
-sniro.api.simpledemo.openecomp.org.    IN      CNAME   vm1.robot.simpledemo.openecomp.org.
-
-;AAF
-aaf.api.simpledemo.openecomp.org.      IN      CNAME   vm1.aaf.simpledemo.openecomp.org.
-aaf-sms.api.simpledemo.openecomp.org.  IN      CNAME   vm1.aaf-sms.simpledemo.openecomp.org.
-
-;MultiService
-msb.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-mvim.api.simpledemo.openecomp.org.     IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-vnfsdk.api.simpledemo.openecomp.org.   IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-vfc.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-uui.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-esr.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-
-;MUSIC
-music.api.simpledemo.openecomp.org.    IN      CNAME   vm1.music.simpledemo.openecomp.org.
-
-;OOF
-oof.api.simpledemo.openecomp.org.      IN      CNAME   vm1.oof.simpledemo.openecomp.org.
-
-;NBI
-nbi.api.simpledemo.openecomp.org.      IN      CNAME   vm1.nbi.simpledemo.openecomp.org.
\ No newline at end of file
diff --git a/boot/bind_zones_onap b/boot/bind_zones_onap
deleted file mode 100644 (file)
index 07d0190..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-;
-; BIND data file for local loopback interface
-;
-$TTL    604800
-@       IN      SOA     simpledemo.onap.org. admin.simpledemo.onap.org. (
-                        20170221        ; Serial
-                         604800         ; Refresh
-                          86400         ; Retry
-                        2419200         ; Expire
-                         604800 )       ; Negative Cache TTL
-;
-; name servers - NS records
-    IN      NS      simpledemo.onap.org.
-
-; name servers - A records
-simpledemo.onap.org.          IN      A       dns_ip_addr
-
-;
-vm1.aai.simpledemo.onap.org.       IN      A       aai1_ip_addr
-c1.vm1.aai.simpledemo.onap.org.    IN      A       aai1_ip_addr
-c2.vm1.aai.simpledemo.onap.org.    IN      A       aai1_ip_addr
-c3.vm1.aai.simpledemo.onap.org.    IN      A       aai1_ip_addr
-
-vm2.aai.simpledemo.onap.org.       IN      A       aai2_ip_addr
-c1.vm2.aai.simpledemo.onap.org.    IN      A       aai2_ip_addr
-c2.vm2.aai.simpledemo.onap.org.    IN      A       aai2_ip_addr
-c3.vm2.aai.simpledemo.onap.org.    IN      A       aai2_ip_addr
-
-vm1.appc.simpledemo.onap.org.      IN      A       appc_ip_addr
-c1.vm1.appc.simpledemo.onap.org.   IN      A       appc_ip_addr
-c2.vm1.appc.simpledemo.onap.org.   IN      A       appc_ip_addr
-
-vm1.sdc.simpledemo.onap.org.      IN      A       sdc_ip_addr
-c1.vm1.sdc.simpledemo.onap.org.   IN      A       sdc_ip_addr
-c2.vm1.sdc.simpledemo.onap.org.   IN      A       sdc_ip_addr
-c3.vm1.sdc.simpledemo.onap.org.   IN      A       sdc_ip_addr
-c4.vm1.sdc.simpledemo.onap.org.   IN      A       sdc_ip_addr
-
-vm1.dcae.simpledemo.onap.org.           IN      A       dcae_ip_addr
-c1.vm1.dcae.simpledemo.onap.org.        IN      A       dcae_ip_addr
-c2.vm1.dcae.simpledemo.onap.org.        IN      A       dcae_ip_addr
-c3.vm1.dcae.simpledemo.onap.org         IN      A       dcae_ip_addr
-
-vm1.mso.simpledemo.onap.org.       IN      A       so_ip_addr
-c1.vm1.mso.simpledemo.onap.org.    IN      A       so_ip_addr
-c1.vm1.mso.simpledemo.onap.org.    IN      A       so_ip_addr
-
-vm1.policy.simpledemo.onap.org.    IN      A       policy_ip_addr
-c1.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
-c2.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
-c3.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
-c4.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
-c5.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
-c6.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
-c7.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
-c8.vm1.policy.simpledemo.onap.org. IN      A       policy_ip_addr
-
-vm1.sdnc.simpledemo.onap.org.      IN      A       sdnc_ip_addr
-c1.vm1.sdnc.simpledemo.onap.org.   IN      A       sdnc_ip_addr
-c2.vm1.sdnc.simpledemo.onap.org.   IN      A       sdnc_ip_addr
-c3.vm1.sdnc.simpledemo.onap.org.   IN      A       sdnc_ip_addr
-c4.vm1.sdnc.simpledemo.onap.org.   IN      A       sdnc_ip_addr
-
-vm1.vid.simpledemo.onap.org.       IN      A       vid_ip_addr
-c1.vm1.vid.simpledemo.onap.org.    IN      A       vid_ip_addr
-c2.vm1.vid.simpledemo.onap.org.    IN      A       vid_ip_addr
-
-vm1.portal.simpledemo.onap.org.           IN      A       portal_ip_addr
-c1.vm1.portal.simpledemo.onap.org.        IN      A       portal_ip_addr
-c2.vm1.portal.simpledemo.onap.org.        IN      A       portal_ip_addr
-
-vm1.robot.simpledemo.onap.org.           IN      A       robot_ip_addr
-c1.vm1.robot.simpledemo.onap.org.        IN      A       robot_ip_addr
-c2.vm1.robot.simpledemo.onap.org.        IN      A       robot_ip_addr
-
-vm1.clamp.simpledemo.onap.org.           IN      A       clamp_ip_addr
-c1.vm1.clamp.simpledemo.onap.org.        IN      A       clamp_ip_addr
-c2.vm1.clamp.simpledemo.onap.org.        IN      A       clamp_ip_addr
-
-vm1.aaf.simpledemo.onap.org.   IN      A       aaf_ip_addr
-vm1.aaf-sms.simpledemo.onap.org.       IN      A       sms_ip_addr
-
-vm1.mr.simpledemo.onap.org.    IN      A       mr_ip_addr
-
-vm1.multiserv.simpledemo.onap.org. IN  A   multiserv_ip_addr
-
-vm1.music.simpledemo.onap.org. IN  A   music_ip_addr
-
-vm1.oof.simpledemo.onap.org. IN  A   oof_ip_addr
-
-vm1.nbi.simpledemo.onap.org. IN  A   nbi_ip_addr
-
-
-;CNAMES
-;A&AI
-aai.api.simpledemo.onap.org.   IN      CNAME   vm1.aai.simpledemo.onap.org.
-aai.ui.simpledemo.onap.org.    IN  CNAME   vm1.aai.simpledemo.onap.org.
-aai.searchservice.simpledemo.onap.org.     IN      CNAME   vm1.aai.simpledemo.onap.org.
-aai.hbase.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
-aai.gremlinserver.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
-aai.elasticsearch.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
-
-;APPC
-appc.api.simpledemo.onap.org.  IN      CNAME   vm1.appc.simpledemo.onap.org.
-
-;ASDC
-sdc.api.simpledemo.onap.org.   IN      CNAME   vm1.sdc.simpledemo.onap.org.
-
-;DCAE
-dcae.api.simpledemo.onap.org.  IN      CNAME   vm1.dcae.simpledemo.onap.org.
-
-;SO
-mso.api.simpledemo.onap.org.   IN      CNAME   vm1.mso.simpledemo.onap.org.
-so.api.simpledemo.onap.org.        IN  CNAME   vm1.mso.simpledemo.onap.org.
-
-;Policy
-policy.api.simpledemo.onap.org.        IN      CNAME   vm1.policy.simpledemo.onap.org.
-
-;SDNC
-sdnc.api.simpledemo.onap.org.  IN      CNAME    vm1.sdnc.simpledemo.onap.org.
-
-;VID
-vid.api.simpledemo.onap.org.   IN      CNAME   vm1.vid.simpledemo.onap.org.
-
-;PORTAL
-portal.api.simpledemo.onap.org.        IN      CNAME   vm1.portal.simpledemo.onap.org.
-
-;Message Router
-mr.api.simpledemo.onap.org.    IN      CNAME   vm1.mr.simpledemo.onap.org.
-ueb.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.
-dbc.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.
-;drprov.api.simpledemo.onap.org.       IN      CNAME   vm1.mr.simpledemo.onap.org.
-
-;CLAMP
-clamp.api.simpledemo.onap.org. IN      CNAME   vm1.clamp.simpledemo.onap.org.
-
-;ROBOT/SNIRO
-robot.api.simpledemo.onap.org. IN      CNAME   vm1.robot.simpledemo.onap.org.
-sniro.api.simpledemo.onap.org. IN      CNAME   vm1.robot.simpledemo.onap.org.
-
-;AAF
-aaf.api.simpledemo.onap.org.   IN      CNAME   vm1.aaf.simpledemo.onap.org.
-aaf-sms.api.simpledemo.onap.org.       IN      CNAME   vm1.aaf-sms.simpledemo.onap.org.
-
-;MultiService
-msb.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-mvim.api.simpledemo.onap.org.  IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-vnfsdk.api.simpledemo.onap.org.        IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-vfc.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-uui.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-esr.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-
-;MUSIC
-music.api.simpledemo.onap.org. IN      CNAME   vm1.music.simpledemo.onap.org.
-
-;OOF
-oof.api.simpledemo.onap.org.   IN      CNAME   vm1.oof.simpledemo.onap.org.
-
-;NBI
-nbi.api.simpledemo.onap.org.   IN      CNAME   vm1.nbi.simpledemo.onap.org.
diff --git a/boot/db_simpledemo_onap_org b/boot/db_simpledemo_onap_org
deleted file mode 100644 (file)
index add2cab..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-;
-; BIND data file for local loopback interface
-;
-$TTL    604800
-@       IN      SOA     simpledemo.onap.org. admin.simpledemo.onap.org. (
-                        20170221        ; Serial
-                         604800         ; Refresh
-                          86400         ; Retry
-                        2419200         ; Expire
-                         604800 )       ; Negative Cache TTL
-;
-; name servers - NS records
-    IN      NS      simpledemo.onap.org.
-
-; name servers - A records
-simpledemo.onap.org.          IN      A       10.0.0.1
-
-;
-vm1.aai.simpledemo.onap.org.       IN      A       10.0.1.1
-c1.vm1.aai.simpledemo.onap.org.    IN      A       10.0.1.1
-c2.vm1.aai.simpledemo.onap.org.    IN      A       10.0.1.1
-c3.vm1.aai.simpledemo.onap.org.    IN      A       10.0.1.1
-
-vm2.aai.simpledemo.onap.org.       IN      A       10.0.1.2
-c1.vm2.aai.simpledemo.onap.org.    IN      A       10.0.1.2
-c2.vm2.aai.simpledemo.onap.org.    IN      A       10.0.1.2
-c3.vm2.aai.simpledemo.onap.org.    IN      A       10.0.1.2
-
-vm1.appc.simpledemo.onap.org.      IN      A       10.0.2.1
-c1.vm1.appc.simpledemo.onap.org.   IN      A       10.0.2.1
-c2.vm1.appc.simpledemo.onap.org.   IN      A       10.0.2.1
-
-vm1.sdc.simpledemo.onap.org.      IN      A       10.0.3.1
-c1.vm1.sdc.simpledemo.onap.org.   IN      A       10.0.3.1
-c2.vm1.sdc.simpledemo.onap.org.   IN      A       10.0.3.1
-c3.vm1.sdc.simpledemo.onap.org.   IN      A       10.0.3.1
-c4.vm1.sdc.simpledemo.onap.org.   IN      A       10.0.3.1
-
-vm1.dcae.simpledemo.onap.org.           IN      A       10.0.4.1
-c1.vm1.dcae.simpledemo.onap.org.        IN      A       10.0.4.1
-c2.vm1.dcae.simpledemo.onap.org.        IN      A       10.0.4.1
-c3.vm1.dcae.simpledemo.onap.org         IN      A       10.0.4.1
-
-vm1.mso.simpledemo.onap.org.       IN      A       10.0.5.1
-c1.vm1.mso.simpledemo.onap.org.    IN      A       10.0.5.1
-c1.vm1.mso.simpledemo.onap.org.    IN      A       10.0.5.1
-
-vm1.policy.simpledemo.onap.org.    IN      A       10.0.6.1
-c1.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
-c2.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
-c3.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
-c4.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
-c5.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
-c6.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
-c7.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
-c8.vm1.policy.simpledemo.onap.org. IN      A       10.0.6.1
-
-vm1.sdnc.simpledemo.onap.org.      IN      A       10.0.7.1
-c1.vm1.sdnc.simpledemo.onap.org.   IN      A       10.0.7.1
-c2.vm1.sdnc.simpledemo.onap.org.   IN      A       10.0.7.1
-c3.vm1.sdnc.simpledemo.onap.org.   IN      A       10.0.7.1
-c4.vm1.sdnc.simpledemo.onap.org.   IN      A       10.0.7.1
-
-vm1.vid.simpledemo.onap.org.       IN      A       10.0.8.1
-c1.vm1.vid.simpledemo.onap.org.    IN      A       10.0.8.1
-c2.vm1.vid.simpledemo.onap.org.    IN      A       10.0.8.1
-
-vm1.portal.simpledemo.onap.org.           IN      A       10.0.9.1
-c1.vm1.portal.simpledemo.onap.org.        IN      A       10.0.9.1
-c2.vm1.portal.simpledemo.onap.org.        IN      A       10.0.9.1
-
-vm1.robot.simpledemo.onap.org.           IN      A       10.0.10.1
-c1.vm1.robot.simpledemo.onap.org.        IN      A       10.0.10.1
-c2.vm1.robot.simpledemo.onap.org.        IN      A       10.0.10.1
-
-vm1.aaf.simpledemo.onap.org.   IN      A       10.0.13.1
-vm1.aaf-sms.simpledemo.onap.org.       IN      A       10.0.13.2
-
-vm1.mr.simpledemo.onap.org.    IN      A       10.0.11.1
-
-vm1.clamp.simpledemo.onap.org.           IN      A       10.0.12.1
-c1.vm1.clamp.simpledemo.onap.org.        IN      A       10.0.12.1
-c2.vm1.clamp.simpledemo.onap.org.        IN      A       10.0.12.1
-
-vm1.multiserv.simpledemo.onap.org.     IN      A       10.0.14.1
-
-vm1.music.simpledemo.onap.org. IN      A       10.0.15.1
-
-vm1.oof.simpledemo.onap.org.   IN      A       10.0.16.1
-
-vm1.nbi.simpledemo.onap.org.   IN      A       10.0.17.1
-
-
-;CNAMES
-;A&AI
-aai.api.simpledemo.onap.org.   IN      CNAME   vm1.aai.simpledemo.onap.org.
-aai.ui.simpledemo.onap.org.    IN  CNAME   vm1.aai.simpledemo.onap.org.
-aai.searchservice.simpledemo.onap.org.     IN      CNAME   vm1.aai.simpledemo.onap.org.
-aai.hbase.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
-aai.gremlinserver.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
-aai.elasticsearch.simpledemo.onap.org. IN      CNAME   vm2.aai.simpledemo.onap.org.
-
-;APPC
-appc.api.simpledemo.onap.org.  IN      CNAME   vm1.appc.simpledemo.onap.org.
-
-;ASDC
-sdc.api.simpledemo.onap.org.   IN      CNAME   vm1.sdc.simpledemo.onap.org.
-
-;DCAE
-dcae.api.simpledemo.onap.org.  IN      CNAME   vm1.dcae.simpledemo.onap.org.
-
-;SO
-mso.api.simpledemo.onap.org.   IN      CNAME   vm1.mso.simpledemo.onap.org.
-so.api.simpledemo.onap.org.        IN  CNAME   vm1.mso.simpledemo.onap.org.
-
-;Policy
-policy.api.simpledemo.onap.org.        IN      CNAME   vm1.policy.simpledemo.onap.org.
-
-;SDNC
-sdnc.api.simpledemo.onap.org.  IN      CNAME    vm1.sdnc.simpledemo.onap.org.
-
-;VID
-vid.api.simpledemo.onap.org.   IN      CNAME   vm1.vid.simpledemo.onap.org.
-
-;PORTAL
-portal.api.simpledemo.onap.org.        IN      CNAME   vm1.portal.simpledemo.onap.org.
-
-;Message Router
-;mr.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.
-ueb.api.simpledemo.onap.org.   IN      CNAME   vm1.mr.simpledemo.onap.org.
-mr.api.simpledemo.onap.org.        IN      A   10.0.4.102
-collector.api.simpledemo.onap.org. IN      A   10.0.4.102
-;dbc.api.simpledemo.onap.org.  IN      CNAME   vm1.mr.simpledemo.onap.org.
-;drprov.api.simpledemo.onap.org.       IN      CNAME   vm1.mr.simpledemo.onap.org.
-
-;ROBOT/SNIRO
-robot.api.simpledemo.onap.org. IN      CNAME   vm1.robot.simpledemo.onap.org.
-sniro.api.simpledemo.onap.org. IN      CNAME   vm1.robot.simpledemo.onap.org.
-
-;CLAMP
-clamp.api.simpledemo.onap.org. IN      CNAME   vm1.clamp.simpledemo.onap.org.
-
-;AAF
-aaf.api.simpledemo.onap.org.   IN      CNAME   vm1.aaf.simpledemo.onap.org.
-aaf-sms.api.simpledemo.onap.org.       IN      CNAME   vm1.aaf-sms.simpledemo.onap.org.
-
-;MultiService
-msb.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-mvim.api.simpledemo.onap.org.  IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-vnfsdk.api.simpledemo.onap.org.        IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-vfc.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-uui.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-esr.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
-
-;MUSIC
-music.api.simpledemo.onap.org. IN      CNAME   vm1.music.simpledemo.onap.org.
-
-;OOF
-oof.api.simpledemo.onap.org.   IN      CNAME   vm1.oof.simpledemo.onap.org.
-
-;NBI
-nbi.api.simpledemo.onap.org.   IN      CNAME   vm1.nbi.simpledemo.onap.org.
\ No newline at end of file
diff --git a/boot/db_simpledemo_openecomp_org b/boot/db_simpledemo_openecomp_org
deleted file mode 100644 (file)
index dc9a43a..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-;
-; BIND data file for local loopback interface
-;
-$TTL    604800
-@       IN      SOA     simpledemo.openecomp.org. admin.simpledemo.openecomp.org. (
-                        20170221        ; Serial
-                         604800         ; Refresh
-                          86400         ; Retry
-                        2419200         ; Expire
-                         604800 )       ; Negative Cache TTL
-;
-; name servers - NS records
-    IN      NS      simpledemo.openecomp.org.
-
-; name servers - A records
-simpledemo.openecomp.org.          IN      A       10.0.0.1
-
-;
-vm1.aai.simpledemo.openecomp.org.       IN      A       10.0.1.1
-c1.vm1.aai.simpledemo.openecomp.org.    IN      A       10.0.1.1
-c2.vm1.aai.simpledemo.openecomp.org.    IN      A       10.0.1.1
-c3.vm1.aai.simpledemo.openecomp.org.    IN      A       10.0.1.1
-
-vm2.aai.simpledemo.openecomp.org.       IN      A       10.0.1.2
-c1.vm2.aai.simpledemo.openecomp.org.    IN      A       10.0.1.2
-c2.vm2.aai.simpledemo.openecomp.org.    IN      A       10.0.1.2
-c3.vm2.aai.simpledemo.openecomp.org.    IN      A       10.0.1.2
-
-vm1.appc.simpledemo.openecomp.org.      IN      A       10.0.2.1
-c1.vm1.appc.simpledemo.openecomp.org.   IN      A       10.0.2.1
-c2.vm1.appc.simpledemo.openecomp.org.   IN      A       10.0.2.1
-
-vm1.sdc.simpledemo.openecomp.org.      IN      A       10.0.3.1
-c1.vm1.sdc.simpledemo.openecomp.org.   IN      A       10.0.3.1
-c2.vm1.sdc.simpledemo.openecomp.org.   IN      A       10.0.3.1
-c3.vm1.sdc.simpledemo.openecomp.org.   IN      A       10.0.3.1
-c4.vm1.sdc.simpledemo.openecomp.org.   IN      A       10.0.3.1
-
-vm1.dcae.simpledemo.openecomp.org.           IN      A       10.0.4.1
-c1.vm1.dcae.simpledemo.openecomp.org.        IN      A       10.0.4.1
-c2.vm1.dcae.simpledemo.openecomp.org.        IN      A       10.0.4.1
-c3.vm1.dcae.simpledemo.openecomp.org         IN      A       10.0.4.1
-
-vm1.mso.simpledemo.openecomp.org.       IN      A       10.0.5.1
-c1.vm1.mso.simpledemo.openecomp.org.    IN      A       10.0.5.1
-c1.vm1.mso.simpledemo.openecomp.org.    IN      A       10.0.5.1
-
-vm1.policy.simpledemo.openecomp.org.    IN      A       10.0.6.1
-c1.vm1.policy.simpledemo.openecomp.org. IN      A       10.0.6.1
-c2.vm1.policy.simpledemo.openecomp.org. IN      A       10.0.6.1
-c3.vm1.policy.simpledemo.openecomp.org. IN      A       10.0.6.1
-c4.vm1.policy.simpledemo.openecomp.org. IN      A       10.0.6.1
-c5.vm1.policy.simpledemo.openecomp.org. IN      A       10.0.6.1
-c6.vm1.policy.simpledemo.openecomp.org. IN      A       10.0.6.1
-c7.vm1.policy.simpledemo.openecomp.org. IN      A       10.0.6.1
-c8.vm1.policy.simpledemo.openecomp.org. IN      A       10.0.6.1
-
-vm1.sdnc.simpledemo.openecomp.org.      IN      A       10.0.7.1
-c1.vm1.sdnc.simpledemo.openecomp.org.   IN      A       10.0.7.1
-c2.vm1.sdnc.simpledemo.openecomp.org.   IN      A       10.0.7.1
-c3.vm1.sdnc.simpledemo.openecomp.org.   IN      A       10.0.7.1
-c4.vm1.sdnc.simpledemo.openecomp.org.   IN      A       10.0.7.1
-
-vm1.vid.simpledemo.openecomp.org.       IN      A       10.0.8.1
-c1.vm1.vid.simpledemo.openecomp.org.    IN      A       10.0.8.1
-c2.vm1.vid.simpledemo.openecomp.org.    IN      A       10.0.8.1
-
-vm1.portal.simpledemo.openecomp.org.           IN      A       10.0.9.1
-c1.vm1.portal.simpledemo.openecomp.org.        IN      A       10.0.9.1
-c2.vm1.portal.simpledemo.openecomp.org.        IN      A       10.0.9.1
-
-vm1.robot.simpledemo.openecomp.org.           IN      A       10.0.10.1
-c1.vm1.robot.simpledemo.openecomp.org.        IN      A       10.0.10.1
-c2.vm1.robot.simpledemo.openecomp.org.        IN      A       10.0.10.1
-
-vm1.aaf.simpledemo.openecomp.org.      IN      A       10.0.13.1
-
-vm1.mr.simpledemo.openecomp.org.       IN      A       10.0.11.1
-
-vm1.clamp.simpledemo.openecomp.org.           IN      A       10.0.12.1
-c1.vm1.clamp.simpledemo.openecomp.org.        IN      A       10.0.12.1
-c2.vm1.clamp.simpledemo.openecomp.org.        IN      A       10.0.12.1
-
-vm1.multiserv.simpledemo.openecomp.org.        IN      A       10.0.14.1
-
-vm1.music.simpledemo.openecomp.org.    IN      A       10.0.15.1
-
-vm1.oof.simpledemo.openecomp.org.      IN      A       10.0.16.1
-
-vm1.nbi.simpledemo.openecomp.org.      IN      A       10.0.17.1
-
-
-;CNAMES
-;A&AI
-aai.api.simpledemo.openecomp.org.      IN      CNAME   vm1.aai.simpledemo.openecomp.org.
-aai.ui.simpledemo.openecomp.org.    IN  CNAME   vm1.aai.simpledemo.openecomp.org.
-aai.searchservice.simpledemo.openecomp.org.     IN      CNAME   vm1.aai.simpledemo.openecomp.org.
-aai.hbase.simpledemo.openecomp.org.    IN      CNAME   vm2.aai.simpledemo.openecomp.org.
-aai.gremlinserver.simpledemo.openecomp.org.    IN      CNAME   vm2.aai.simpledemo.openecomp.org.
-aai.elasticsearch.simpledemo.openecomp.org.    IN      CNAME   vm2.aai.simpledemo.openecomp.org.
-
-;APPC
-appc.api.simpledemo.openecomp.org.     IN      CNAME   vm1.appc.simpledemo.openecomp.org.
-
-;ASDC
-sdc.api.simpledemo.openecomp.org.      IN      CNAME   vm1.sdc.simpledemo.openecomp.org.       
-
-;DCAE
-dcae.api.simpledemo.openecomp.org.     IN      CNAME   vm1.dcae.simpledemo.openecomp.org.
-
-;SO
-mso.api.simpledemo.openecomp.org.      IN      CNAME   vm1.mso.simpledemo.openecomp.org.
-so.api.simpledemo.openecomp.org.       IN      CNAME   vm1.mso.simpledemo.openecomp.org.
-
-;Policy
-policy.api.simpledemo.openecomp.org.   IN      CNAME   vm1.policy.simpledemo.openecomp.org.
-
-;SDNC
-sdnc.api.simpledemo.openecomp.org.     IN      CNAME    vm1.sdnc.simpledemo.openecomp.org.
-
-;VID
-vid.api.simpledemo.openecomp.org.      IN      CNAME   vm1.vid.simpledemo.openecomp.org.       
-
-;PORTAL
-portal.api.simpledemo.openecomp.org.   IN      CNAME   vm1.portal.simpledemo.openecomp.org.
-
-;Message Router
-;mr.api.simpledemo.openecomp.org.      IN      CNAME   vm1.mr.simpledemo.openecomp.org.        
-ueb.api.simpledemo.openecomp.org.      IN      CNAME   vm1.mr.simpledemo.openecomp.org.
-mr.api.simpledemo.openecomp.org.        IN      A   10.0.4.102
-collector.api.simpledemo.openecomp.org. IN      A   10.0.4.102
-;dbc.api.simpledemo.openecomp.org.     IN      CNAME   vm1.mr.simpledemo.openecomp.org.
-;drprov.api.simpledemo.openecomp.org.  IN      CNAME   vm1.mr.simpledemo.openecomp.org.
-
-;ROBOT/SNIRO
-robot.api.simpledemo.openecomp.org.    IN      CNAME   vm1.robot.simpledemo.openecomp.org.
-sniro.api.simpledemo.openecomp.org.    IN      CNAME   vm1.robot.simpledemo.openecomp.org.
-
-;CLAMP
-clamp.api.simpledemo.openecomp.org.    IN      CNAME   vm1.clamp.simpledemo.openecomp.org.
-
-;AAF
-aaf.api.simpledemo.openecomp.org.      IN      CNAME   vm1.aaf.simpledemo.openecomp.org.
-
-;MultiService
-msb.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-mvim.api.simpledemo.openecomp.org.     IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-vnfsdk.api.simpledemo.openecomp.org.   IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-vfc.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-uui.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-esr.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
-
-;MUSIC
-music.api.simpledemo.openecomp.org.    IN      CNAME   vm1.music.simpledemo.openecomp.org.
-
-;OOF
-oof.api.simpledemo.openecomp.org.      IN      CNAME   vm1.oof.simpledemo.openecomp.org.
-
-;NBI
-nbi.api.simpledemo.openecomp.org.      IN      CNAME   vm1.nbi.simpledemo.openecomp.org.
\ No newline at end of file
diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
deleted file mode 100755 (executable)
index 17ab003..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-#!/bin/bash
-#############################################################################
-#
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#############################################################################
-
-
-
-
-################################## start of vm_init #####################################
-
-set -ex
-
-URL_ROOT='nexus.onap.org/service/local/repositories/raw/content'
-REPO_BLUEPRINTS='org.onap.dcaegen2.platform.blueprints'
-REPO_DEPLOYMENTS='org.onap.dcaegen2.deployments'
-if [ -e /opt/config/dcae_deployment_profile.txt ]; then
-  DEPLOYMENT_PROFILE=$(cat /opt/config/dcae_deployment_profile.txt)
-fi
-DEPLOYMENT_PROFILE=${DEPLOYMENT_PROFILE:-R3}
-
-NEXUS_USER=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWORD=$(cat /opt/config/nexus_password.txt)
-NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-DOCKER_VERSION=$(cat /opt/config/docker_version.txt)
-
-MYFLOATIP=$(cat /opt/config/dcae_float_ip.txt)
-MYLOCALIP=$(cat /opt/config/dcae_ip_addr.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# clean up old network configuration in docker engine
-set +e
-if [ -n "$(docker ps -q -a)" ]; then
-  docker stop $(docker ps -q -a)
-  docker update --restart=no $(docker ps -a -q)
-  systemctl restart docker
-  docker rm $(docker ps -q -a)
-  if [ -n "$(docker network ls | grep 'config_default')" ]; then
-    docker network rm config_default
-  fi
-fi
-set -e
-
-
-docker login -u "$NEXUS_USER" -p "$NEXUS_PASSWORD" "$NEXUS_DOCKER_REPO"
-
-if [[ $DEPLOYMENT_PROFILE == R1* || $DEPLOYMENT_PROFILE == R2* ]]; then
-  echo "R1 and R2 deployment profiles are not supported in Casablanca Heat deployment"
-elif [[ $DEPLOYMENT_PROFILE == R3* ]]; then
-  RELEASE_TAG='R3'
-
-  set +e
-  rm -rf /opt/app/inputs-templates
-  mkdir -p /opt/app/inputs-templates
-  wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/docker-compose-1.yaml
-  wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/docker-compose-2.yaml
-  wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/docker-compose-3.yaml
-  wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/docker-compose-4.yaml
-  wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/register.sh
-  wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/setup.sh
-  wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/teardown.sh
-
-  pip install --upgrade jinja2
-  wget https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/scripts/detemplate-bpinputs.py \
-    && \
-    (python detemplate-bpinputs.py /opt/config /opt/app/inputs-templates /opt/app/config; \
-     rm detemplate-bpinputs.py)
-
-  if [ -e /opt/app/config/register.sh ]; then
-    chmod +x /opt/app/config/register.sh
-  fi
-  if [ -e /opt/app/config/setup.sh ]; then
-    chmod +x /opt/app/config/setup.sh
-  fi
-  if [ -e /opt/app/config/build-plugins.sh ]; then
-    chmod +x /opt/app/config/build-plugins.sh
-  fi
-  set -e
-
-  cd /opt/app/config
-  # deploy essentials
-  /opt/docker/docker-compose -f docker-compose-1.yaml up -d
-
-  # wait for essentials to become ready
-  echo "Waiting for Consul to come up ready"
-  while ! nc -z localhost 8500; do sleep 1; done
-  echo "Waiting for Postgres DB to come up ready"
-  while ! nc -z localhost 5432; do sleep 1; done
-  echo "Waiting for CBS to come up ready"
-  while ! nc -z localhost 10000; do sleep 1; done
-  echo "All dependencies are up, proceed to the next phase"
-  sleep 30
-
-  echo "Setup CloudifyManager and Registrator"
-  ./setup.sh
-  sleep 10
-
-  export http_proxy=""
-  export https_proxy=""
-
-  ./register.sh
-
-  echo "Bring up DCAE MIN service components for R2 use cases"
-  /opt/docker/docker-compose -f docker-compose-2.yaml up -d
-
-  if [[ "$DEPLOYMENT_PROFILE" == "R3" || "$DEPLOYMENT_PROFILE" == "R3PLUS" ]]; then
-    echo "Bring up DCAE platform components"
-    /opt/docker/docker-compose -f docker-compose-3.yaml up -d
-
-    if [[ "$DEPLOYMENT_PROFILE" == "R3PLUS" ]]; then
-      echo "Bring up additional (plus) DCAE service components"
-      /opt/docker/docker-compose -f docker-compose-4.yaml up -d
-    fi
-  fi
-
-  # start proxy for consul's health check
-  CONSULIP=$(cat /opt/config/dcae_ip_addr.txt)
-  echo "Consul is available at $CONSULIP"
-fi
-
-cat >./nginx.conf <<EOL
-server {
-    listen 80;
-    server_name dcae.simpledemo.onap.org;
-    root /www/healthcheck;
-
-    location /healthcheck {
-        try_files /services.yaml =404;
-    }
-    location /R3MIN{
-        try_files /r3mvp_healthy.yaml =404;
-    }
-    location /R3 {
-        try_files /r3_healthy.yaml =404;
-    }
-    location /R3PLUS {
-        try_files /r3plus_healthy.yaml =404;
-    }
-}
-EOL
-
-HEALTHPORT=8000
-docker run -d \
---name dcae-health \
--p ${HEALTHPORT}:80 \
--v "$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf" \
--v "/tmp/healthcheck:/www/healthcheck" \
---label "SERVICE_80_NAME=dcae-health" \
---label "SERVICE_80_CHECK_HTTP=/healthcheck" \
---label "SERVICE_80_CHECK_INTERVAL=15s" \
---label "SERVICE_80_CHECK_INITIAL_STATUS=passing" \
- nginx
-
-echo "Healthcheck API available at http://${MYFLOATIP}:${HEALTHPORT}/healthcheck"
-echo "                             http://${MYFLOATIP}:${HEALTHPORT}/R3"
-echo "                             http://${MYFLOATIP}:${HEALTHPORT}/R3MIN"
-echo "                             http://${MYFLOATIP}:${HEALTHPORT}/R3PLUS"
-
-# run forever for updating health status based on consul
-set +e
-while :
-do
-  rm -rf /tmp/healthcheck/*
-  # all registered services
-  SERVICES=$(curl -s http://consul:8500/v1/agent/services |jq '. | to_entries[] | .value.Service')
-  # passing services
-  SERVICES=$(curl -s http://consul:8500/v1/health/state/passing | jq '.[] | .ServiceName')
-
-  # remove empty lines/entries
-  SERVICES=$(echo "$SERVICES" | sed '/^\s*\"\"\s*$/d' |sed '/^\s*$/d')
-
-  SERVICES_JSON=$(echo "$SERVICES" | sed 's/\"$/\",/g' | sed '$ s/.$//')
-
-  echo "$(date): running healthy services:"
-  echo ">>>  $SERVICES"
-  PLT_CONSUL=$(echo "$SERVICES" |grep "consul")
-  PLT_CBS=$(echo "$SERVICES" |grep "config_binding_service")
-  MVP_PG_HOLMES=$(echo "$SERVICES" |grep "pgHolmes")
-  MVP_VES=$(echo "$SERVICES" |grep "mvp.*ves")
-  MVP_TCA=$(echo "$SERVICES" |grep "mvp.*tca")
-  MVP_HR=$(echo "$SERVICES" |grep "mvp.*holmes-rule")
-  MVP_HE=$(echo "$SERVICES" |grep "mvp.*holmes-engine")
-
-  PLT_CM=$(echo "$SERVICES" |grep "cloudify.*manager")
-  PLT_DH=$(echo "$SERVICES" |grep "deployment.*handler")
-  PLT_PH=$(echo "$SERVICES" |grep "policy.*handler")
-  PLT_SCH=$(echo "$SERVICES" |grep "service.*change.*handler")
-  PLT_INV=$(echo "$SERVICES" |grep "inventory")
-  PLT_PG_INVENTORY=$(echo "$SERVICES" |grep "pgInventory")
-
-  PLUS_MHB=$(echo "$SERVICES" |grep "heartbeat")
-  PLUS_PRH=$(echo "$SERVICES" |grep "prh")
-  PLUS_MPR=$(echo "$SERVICES" |grep "mapper")
-  PLUS_TRAP=$(echo "$SERVICES" |grep "snmptrap")
-
-  DATA="{\"healthy\" : \"$(date)\", \"healthy_services\": [${SERVICES_JSON}]}"
-  if [[ -n "$PLT_CONSUL" && -n "$PLT_CBS" && -n "$MVP_PG_HOLMES" && -n "$MVP_VES" && \
-        -n "$MVP_TCA" ]]; then
-    echo "${DATA}" > /tmp/healthcheck/r3mvp_healthy.yaml
-    echo "${DATA}" > /tmp/healthcheck/services.yaml
-    echo ">>>>>> enough services satisfying R3MIN service deployment"
-  else
-    echo ">>>>>> not enough services satisfying R3MIN service deployment"
-  fi
-
-  if [[ -n "$PLT_CONSUL" && -n "$PLT_CBS" && -n "$PLT_CM" && -n "$PLT_DH" && \
-        -n "$PLT_PH" && -n "$PLT_SCH" && -n "$PLT_INV" && -n "$PLT_PG_INVENTORY" ]]; then
-    echo ">>>>>> enough services satisfying R3 platform deployment"
-    echo "${DATA}" > /tmp/healthcheck/r3_healthy.yaml
-
-    if [[ -n "$PLUS_MHB" && -n "$PLUS_PRH" && -n "$PLUS_MPR" && -n "$PLUS_TRAP"  && -n "$MVP_HR" && -n "$MVP_HE" ]]; then
-      echo ">>>>>> enough services satisfying R3PLUS deployment"
-      echo "${DATA}" > /tmp/healthcheck/r3plus_healthy.yaml
-    else
-      echo ">>>>>> not enough services satisfying R3PLUS service deployment"
-    fi
-  else
-    echo ">>>>>> not enough services satisfying R3 platform or R3PLUS service deployment"
-  fi
-  
-  sleep 60
-done
-
diff --git a/boot/esr_vm_init.sh b/boot/esr_vm_init.sh
deleted file mode 100644 (file)
index 2664905..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-DOCKER_IMAGE_VERSION=$(cat /opt/config/esr_docker.txt)
-
-source /opt/config/onap_ips.txt
-
-# start up esr
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/aai/esr-server:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/aai/esr-gui:$DOCKER_IMAGE_VERSION
-
-docker rm -f esr_server
-docker rm -f esr_gui
-
-docker run -i -t -d -p 9518:9518 -e MSB_ADDR=$MULTISERV_IP:443 --name esr_server $NEXUS_DOCKER_REPO/onap/aai/esr-server:$DOCKER_IMAGE_VERSION
-docker run -i -t -d -p 9519:8080 -e MSB_ADDR=$MULTISERV_IP:443 --name esr_gui $NEXUS_DOCKER_REPO/onap/aai/esr-gui:$DOCKER_IMAGE_VERSION
\ No newline at end of file
diff --git a/boot/msb_vm_init.sh b/boot/msb_vm_init.sh
deleted file mode 100644 (file)
index a59e50c..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/bin/bash
-
-NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-DOCKER_IMAGE_VERSION=$(cat /opt/config/msb_docker.txt)
-
-source /opt/config/onap_ips.txt
-
-# start up MSB
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/msb/msb_discovery:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/msb/msb_apigateway:$DOCKER_IMAGE_VERSION
-
-docker rm -f msb_consul
-docker rm -f msb_discovery
-docker rm -f msb_apigateway
-
-docker run -d -p 8500:8500  --name msb_consul consul:0.9.3
-CONSUL_IP=`sudo docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' msb_consul`
-
-docker run -d  -p 10081:10081  -e CONSUL_IP=$CONSUL_IP --name msb_discovery $NEXUS_DOCKER_REPO/onap/msb/msb_discovery:$DOCKER_IMAGE_VERSION
-DISCOVERY_IP=`sudo docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' msb_discovery`
-
-docker run -d -p 80:80 -p 443:443  -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP -e "ROUTE_LABELS=visualRange:0|1" --name msb_apigateway $NEXUS_DOCKER_REPO/onap/msb/msb_apigateway:$DOCKER_IMAGE_VERSION
-
-# Allow the MSB container to come up before registering services
-sleep 20
-
-# register ONAP services to MSB
-#aai
-#cloud-infrastructure
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v12", "url": "/aai/v12/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v13", "url": "/aai/v13/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","path": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v12", "url": "/aai/v12/cloud-infrastructure","path": "/aai/v12/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v13", "url": "/aai/v13/cloud-infrastructure","path": "/aai/v13/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-#business
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v11", "url": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v12", "url": "/aai/v12/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v13", "url": "/aai/v13/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v11", "url": "/aai/v11/business","path": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v12", "url": "/aai/v12/business","path": "/aai/v12/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v13", "url": "/aai/v13/business","path": "/aai/v13/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-#actions
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v11", "url": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v12", "url": "/aai/v12/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v13", "url": "/aai/v13/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v11", "url": "/aai/v11/actions","path": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v12", "url": "/aai/v12/actions","path": "/aai/v12/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v13", "url": "/aai/v13/actions","path": "/aai/v13/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-#service-design-and-creation
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v12", "url": "/aai/v12/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v13", "url": "/aai/v13/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","path": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v12", "url": "/aai/v12/service-design-and-creation","path": "/aai/v12/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v13", "url": "/aai/v13/service-design-and-creation","path": "/aai/v13/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-#network
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v11", "url": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v12", "url": "/aai/v12/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v13", "url": "/aai/v13/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v11", "url": "/aai/v11/network","path": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v12", "url": "/aai/v12/network","path": "/aai/v12/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v13", "url": "/aai/v13/network","path": "/aai/v13/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-#externalSystem
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v12", "url": "/aai/v12/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v13", "url": "/aai/v13/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","path": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v12", "url": "/aai/v12/external-system","path": "/aai/v12/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v13", "url": "/aai/v13/external-system","path": "/aai/v13/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-#traversal
-#generic-query
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v11", "url": "/aai/v11/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v12", "url": "/aai/v12/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v13", "url": "/aai/v13/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v11", "url": "/aai/v11/generic-query","path": "/aai/v11/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v12", "url": "/aai/v12/generic-query","path": "/aai/v12/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v13", "url": "/aai/v13/generic-query","path": "/aai/v13/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-#nodes-query
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v11", "url": "/aai/v11/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v12", "url": "/aai/v12/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v13", "url": "/aai/v13/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v11", "url": "/aai/v11/nodes-query","path": "/aai/v11/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v12", "url": "/aai/v12/nodes-query","path": "/aai/v12/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v13", "url": "/aai/v13/nodes-query","path": "/aai/v13/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-#query
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v11", "url": "/aai/v11/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v12", "url": "/aai/v12/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v13", "url": "/aai/v13/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v11", "url": "/aai/v11/query","path": "/aai/v11/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v12", "url": "/aai/v12/query","path": "/aai/v12/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v13", "url": "/aai/v13/query","path": "/aai/v13/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-#named-query
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-named-query", "url": "/aai/search","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-named-query", "url": "/aai/search","path": "/aai/search","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-#search
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-search", "version": "v11", "url": "/aai/v11/search","protocol": "REST", "enable_ssl":"True", "lb_policy":"round-robin","nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-
-# esr (not deployed together with AAI
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-server", "version": "v1", "url": "/api/aai-esr-server/v1","protocol": "REST", "enable_ssl":"true",  "visualRange":"1", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9518"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-gui", "version": "v1", "url": "/esr-gui","path": "/iui/aai-esr-gui","protocol": "UI",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9519"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-#so
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so", "version": "v1", "url": "/ecomp/mso/infra","protocol": "REST",  "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so-deprecated", "version": "v1", "url": "/ecomp/mso/infra","path": "/ecomp/mso/infra","protocol": "REST",  "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-#Dmaap message router
-#curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "message-router", "version": "v1", "url": "/","protocol": "REST",  "nodes": [ {"ip": "'$DMAAP_IP'","port": "3904"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-#policy
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp", "version": "v1", "url": "/pdp","protocol": "REST",  "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp-deprecated", "version": "v1", "url": "/pdp","path": "/pdp","protocol": "REST",  "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-#portal
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "portal", "version": "v2", "url": "/","protocol": "REST",  "nodes": [ {"ip": "'$PORTAL_IP'","port": "8989"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-#sdc
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc", "version": "v1", "url": "/sdc/v1","protocol": "REST",  "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc-deprecated", "version": "v1", "url": "/sdc/v1","path": "/sdc/v1","protocol": "REST",  "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-#sdnc
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc", "version": "v1", "url": "/","protocol": "REST",  "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc-compatible", "version": "v1", "url": "/restconf","path": "/restconf","protocol": "REST",  "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-#multi-vim
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v0", "url": "/api/multicloud/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9001"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v1", "url": "/api/multicloud/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9001"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-vio", "version": "v0", "url": "/api/multicloud-vio/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9004"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-vio", "version": "v1", "url": "/api/multicloud-vio/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9004"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v0", "url": "/api/multicloud-ocata/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9006"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v1", "url": "/api/multicloud-ocata/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9006"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-pike", "version": "v0", "url": "/api/multicloud-pike/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9007"}]}' "http://$MULTISERV_IP:10081/api/microservices/v0/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-pike", "version": "v1", "url": "/api/multicloud-pike/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9007"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titaniumcloud", "version": "v0", "url": "/api/multicloud-titaniumcloud/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9005"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titaniumcloud", "version": "v1", "url": "/api/multicloud-titaniumcloud/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9005"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-starlingx", "version": "v0", "url": "/api/multicloud-starlingx/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9009"}]}' "http://$MULTISERV_IP:10081/api/microservices/v0/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-starlingx", "version": "v1", "url": "/api/multicloud-starlingx/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9009"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-#VF-C
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nslcm", "version": "v1", "url": "/api/nslcm/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8403"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztevnfmdriver", "version": "v1", "url": "/api/ztevnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8410"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztesdncdriver", "version": "v1", "url": "/api/ztesdncdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8411"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "resmgr", "version": "v1", "url": "/api/resmgr/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8480"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "gvnfmdriver", "version": "v1", "url": "/api/gvnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8484"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "huaweivnfmdriver", "version": "v1", "url": "/api/huaweivnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8482"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nokiavnfmdriver", "version": "v1", "url": "/api/nokiavnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8485"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "jujuvnfmdriver", "version": "v1", "url": "/api/jujuvnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8483"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multivimproxy", "version": "v1", "url": "/api/multivimproxy/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8481"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnflcm", "version": "v1", "url": "/api/vnflcm/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8801"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfres", "version": "v1", "url": "/api/vnfres/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8802"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfmgr", "version": "v1", "url": "/api/vnfmgr/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8803"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "activiti", "version": "v1", "url": "/activiti-rest", "path": "/activiti-rest" "protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8804"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow", "version": "v1", "url": "/api/workflow/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8805"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow-modeler", "version": "v1", "url": "/api/workflow-modeler/v1","protocol": "REST",  "nodes": [ {"ip": "'$SDC_IP'","port": "9527"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow-modeler-ui", "version": "v1", "url": "/workflow-modeler","path": "/workflow-modeler","protocol": "UI",  "nodes": [ {"ip": "'$SDC_IP'","port": "9527"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "catalog", "version": "v1", "url": "/api/catalog/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8806"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "NokiaSVNFM", "version": "v1", "url": "/api/NokiaSVNFM/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8089"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "emsdriver", "version": "v1", "url": "/api/emsdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8206"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-#UUI
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-server", "version": "v1", "url": "/api/usecaseui/server/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8082"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-ui", "version": "v1", "url": "/usecase-ui","path": "/iui/usecaseui","protocol": "UI",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
-
-# CLAMP
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "clamp", "version": "v1", "url": "/restservices/clds/v1","protocol": "REST", "visualRange":"1", "nodes": [ {"ip": "'$CLAMP_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
diff --git a/boot/multiserv_all_serv.sh b/boot/multiserv_all_serv.sh
deleted file mode 100644 (file)
index 57de290..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-bash /opt/msb_vm_init.sh &>/dev/null &disown
-bash /opt/vnfsdk_vm_init.sh &>/dev/null &disown
-bash /opt/mvim_vm_init.sh &>/dev/null &disown
-bash /opt/vfc_vm_init.sh &>/dev/null &disown
-bash /opt/uui_vm_init.sh &>/dev/null &disown
-bash /opt/esr_vm_init.sh &>/dev/null &disown
\ No newline at end of file
diff --git a/boot/mvim_vm_init.sh b/boot/mvim_vm_init.sh
deleted file mode 100755 (executable)
index 7c56fa3..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Establish environment variables
-NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-DOCKER_IMAGE_VERSION=$(cat /opt/config/mvim_docker.txt)
-DOCKER_IMAGE_OPENSTACK_VERSION=$(cat /opt/config/mvim_openstack_docker.txt)
-
-source /opt/config/onap_ips.txt
-
-# Refresh images
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/multicloud/framework:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/multicloud/vio:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/multicloud/openstack-ocata:$DOCKER_IMAGE_OPENSTACK_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/multicloud/openstack-pike:$DOCKER_IMAGE_OPENSTACK_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/multicloud/openstack-windriver:$DOCKER_IMAGE_OPENSTACK_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/multicloud/openstack-starlingx:$DOCKER_IMAGE_OPENSTACK_VERSION
-
-docker rm -f multicloud-broker
-docker rm -f multicloud-vio
-docker rm -f multicloud-ocata
-docker rm -f multicloud-pike
-docker rm -f multicloud-windriver
-docker rm -f multicloud-starlingx
-
-docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9001:9001 --name multicloud-broker $NEXUS_DOCKER_REPO/onap/multicloud/framework:$DOCKER_IMAGE_VERSION
-docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -e MR_ADDR=$MR_IP -p 9004:9004 --name multicloud-vio $NEXUS_DOCKER_REPO/onap/multicloud/vio:$DOCKER_IMAGE_VERSION
-docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9006:9006 --name multicloud-ocata $NEXUS_DOCKER_REPO/onap/multicloud/openstack-ocata:$DOCKER_IMAGE_OPENSTACK_VERSION
-docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9007:9007 --name multicloud-pike $NEXUS_DOCKER_REPO/onap/multicloud/openstack-pike:$DOCKER_IMAGE_OPENSTACK_VERSION
-docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9005:9005 --name multicloud-windriver $NEXUS_DOCKER_REPO/onap/multicloud/openstack-windriver:$DOCKER_IMAGE_OPENSTACK_VERSION
-docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9009:9009 --name multicloud-starlingx $NEXUS_DOCKER_REPO/onap/multicloud/openstack-starlingx:$DOCKER_IMAGE_OPENSTACK_VERSION
diff --git a/boot/named.conf.local b/boot/named.conf.local
deleted file mode 100644 (file)
index f372cba..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Do any local configuration here
-//
-
-// Consider adding the 1918 zones here, if they are not used in your
-// organization
-//include "/etc/bind/zones.rfc1918";
-
-zone "simpledemo.openecomp.org" {
-    type master;
-    file "/etc/bind/zones/db.simpledemo.openecomp.org"; # zone file path
-};
-
-zone "simpledemo.onap.org" {
-    type master;
-    file "/etc/bind/zones/db.simpledemo.onap.org"; # zone file path
-};
diff --git a/boot/named.conf.options b/boot/named.conf.options
deleted file mode 100644 (file)
index 23feebc..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-acl "trusted" {
-        #x.x.x.x;
-};
-options {
-        directory "/var/cache/bind";
-
-        recursion yes;                 # enables recursive queries
-        allow-recursion { 10.0/16; };  # allows recursive queries from "trusted” clients i.e. LB only
-        listen-on { 10.0.0.1; };   # ns1 IP address - listen on this address only
-        allow-transfer { none; };      # disable zone transfers by default
-
-        forwarders {
-                dns_forwarder;
-        };
-
-        // If there is a firewall between you and nameservers you want
-        // to talk to, you may need to fix the firewall to allow multiple
-        // ports to talk.  See http://www.kb.cert.org/vuls/id/800113
-
-        // If your ISP provided one or more IP addresses for stable
-        // nameservers, you probably want to use them as forwarders.
-        // Uncomment the following block, and insert the addresses replacing
-        // the all-0's placeholder.
-
-        // forwarders {
-        //      0.0.0.0;
-        // };
-
-        //========================================================================
-        // If BIND logs error messages about the root key being expired,
-        // you will need to update your keys.  See https://www.isc.org/bind-keys
-        //========================================================================
-        dnssec-validation auto;
-
-        auth-nxdomain no;    # conform to RFC1035
-        listen-on-v6 { any; };
-};
-
diff --git a/boot/pom.xml b/boot/pom.xml
deleted file mode 100644 (file)
index a639ca9..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ============LICENSE_START==========================================
- ===================================================================
- Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.
- ===================================================================
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- ============LICENSE_END============================================
-
- ECOMP and OpenECOMP are trademarks
- and service marks of AT&T Intellectual Property.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.onap.demo.vnf</groupId>
-    <artifactId>demo-aggregator</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onap.demo</groupId>
-  <artifactId>boot</artifactId>
-  <packaging>pom</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.1.0</version>
-        <configuration>
-          <descriptors>
-            <descriptor>assembly.xml</descriptor>
-          </descriptors>
-          <appendAssemblyId>false</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id> <!-- this is used for inheritance merges -->
-            <phase>package</phase> <!-- bind to the packaging phase -->
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/boot/sdc_ext_volume_partitions.txt b/boot/sdc_ext_volume_partitions.txt
deleted file mode 100644 (file)
index b00c6ae..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# partition table of /dev/xvdb
-unit: sectors
-
-/dev/xvdb1 : start=     2048, size=209713152, Id=83
-/dev/xvdb2 : start=        0, size=        0, Id= 0
-/dev/xvdb3 : start=        0, size=        0, Id= 0
-/dev/xvdb4 : start=        0, size=        0, Id= 0
diff --git a/boot/uui_vm_init.sh b/boot/uui_vm_init.sh
deleted file mode 100755 (executable)
index 46a8edf..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Establish environment variables
-NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-DOCKER_IMAGE_VERSION=$(cat /opt/config/uui_docker.txt)
-
-source /opt/config/onap_ips.txt
-
-# Refresh images
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/usecase-ui:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/usecase-ui/usecase-ui-server:$DOCKER_IMAGE_VERSION
-
-docker rm -f uui_ui
-docker rm -f uui_server
-
-# Insert docker run instructions here
-docker run -i -t -d --name uui_ui -p 8080:8080 -e MSB_ADDR=$MULTISERV_IP:80 $NEXUS_DOCKER_REPO/onap/usecase-ui:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name uui_server -p 8082:8082 -e MSB_ADDR=$MULTISERV_IP:80 -e MR_ADDR=$MR_IP:3904 $NEXUS_DOCKER_REPO/onap/usecase-ui/usecase-ui-server:$DOCKER_IMAGE_VERSION
\ No newline at end of file
diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh
deleted file mode 100755 (executable)
index b5db8ed..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-# Establish environment variables
-NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-
-source /opt/config/onap_ips.txt
-source /opt/config/vfc_docker.txt
-
-# Refresh images
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/db:$DB_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$ACTIVITI_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$MGRSERVICE_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/catalog:$CATALOG_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MULTIVIMPROXY_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$EMSDRIVER_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$GVNFMDRIVER_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$JUJUDRIVER_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$HUAWEI_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$NSLCM_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$RESMANAGEMENT_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER
-
-docker rm -f vfc_db
-docker rm -f vfc_wfengine_mgrservice
-docker rm -f vfc_wfengine_activiti
-docker rm -f vfc_catalog
-docker rm -f vfc_emsdriver
-docker rm -f vfc_multivimproxy
-docker rm -f vfc_gvnfmdriver
-docker rm -f vfc_jujudriver
-docker rm -f vfc_svnfm_huawei
-docker rm -f vfc_nslcm
-docker rm -f vfc_resmanagement
-docker rm -f vfc_vnflcm
-docker rm -f vfc_vnfmgr
-docker rm -f vfc_vnfres
-docker rm -f vfc_ztesdncdriver
-docker rm -f vfc_ztevnfmdriver
-docker rm -f vfc_svnfm_nokia
-docker rm -f vfc_svnfm_nokiav2
-
-# Insert docker run instructions here
-docker run -i -t -d --name vfc_db -p 3306:3306 -p 6379:6379 $NEXUS_DOCKER_REPO/onap/vfc/db:$DB_DOCKER_VER
-VFC_DB_IP=`sudo docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vfc_db`
-docker run -i -t -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$MULTISERV_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=$MULTISERV_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$ACTIVITI_DOCKER_VER
-docker run -i -t -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_IP=$MULTISERV_IP -e SERVICE_PORT=8805 -e OPENPALETTE_MSB_IP=$MULTISERV_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$MGRSERVICE_DOCKER_VER
-docker run -i -t -d --name vfc_catalog -p 8806:8806 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/catalog:$CATALOG_DOCKER_VER
-docker run -i -t -d --name vfc_emsdriver -p 8206:8206 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP -e VES_ADDR=$DCAE_COLL_IP:8080 -e VES_AUTHINFO="":"" $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$EMSDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_gvnfmdriver -p 8484:8484 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$GVNFMDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_jujudriver -p 8483:8483 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$JUJUDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_svnfm_huawei -p 8482:8482 -p 8443:8443 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$HUAWEI_DOCKER_VER
-docker run -i -t -d --name vfc_nslcm -p 8403:8403 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$NSLCM_DOCKER_VER
-docker run -i -t -d --name vfc_resmanagement -p 8480:8480 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$RESMANAGEMENT_DOCKER_VER
-docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER
-docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
-docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MYSQL_ADDR=${VFC_DB_IP}:3306 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
-docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
-docker run -i -t -d --name vfc_multivimproxy -p 8481:8481 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MULTIVIMPROXY_DOCKER_VER
-
-VNFM_ID=vnfmUuid
-docker run -i -t -d --name vfc_svnfm_nokiav2 -p 8089:8089 -e EXTERNAL_PORT=8089 -e MSB_IP=$MULTISERV_IP -e CONFIGURE=kuku -e EXTERNAL_IP=$MULTISERV_IP -e "VNFM_ID=$VNFM_ID" -d --stop-timeout 300 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER
diff --git a/boot/vnfsdk_vm_init.sh b/boot/vnfsdk_vm_init.sh
deleted file mode 100755 (executable)
index 6d99d29..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# Starts docker containers for VNFSDK VNF  repository.
-# Version for Amsterdam/R1 uses docker-compose.
-
-# be verbose
-set -x
-
-# Establish environment variables
-NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-export NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-#DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) --> not needed at the moment
-
-# Refresh configuration and scripts
-cd /opt/refrepo
-git pull
-cd vnfmarket-be/deployment/install
-
-# Get image names used below from docker-compose environment file
-source .env
-
-# Refresh images
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/vnfsdk/refrepo:${REFREPO_TAG}
-docker pull $NEXUS_DOCKER_REPO/onap/vnfsdk/refrepo/postgres:${POSTGRES_TAG}
-
-# docker-compose is not in /usr/bin
-/opt/docker/docker-compose down
-/opt/docker/docker-compose up -d
-
diff --git a/docker_upgrade_scripts/README.md b/docker_upgrade_scripts/README.md
deleted file mode 100644 (file)
index 5d98158..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#Docker Upgrade Scripts
-
-##Description
-These scripts will upgrade docker images in all ONAP components 
-
-##Setting UP
-
-apt-get install python-pip
-
-pip install Fabric
-
-Download all the files and modify onap_docker_upgrade.conf with correct configuration based on infrastructure endpoints
-
-[keystone_auth]
-user = <user_name>
-password = <password>
-tenant = <tenant>
-url = <keystone_url>
-
-user: User name to access the tenant
-Password: Password for the user authentication
-tenant: Tenant information
-url: keystone endpoint URL. Currently v2.0 is only supported
-
-[onap]
-instance_prefix = <name>
-
-instance_prefix: ONAP instance prefix configured in heat template or VM name
-
-Deployment type: 1-nic-nofloat, 1-nic-float, 2-nic
-deployment_type = <type>
-
-deployment_type: Based on infrastructure network setup for VMs
-
-dcae_key_path = <key_for_dcae_component>
-onap_key_path = <key_for_onap_component>
-
-Run python onap_docker_upgrade.py
-
-To run daily basis, add the script to cron job and redirect output to a log file
diff --git a/docker_upgrade_scripts/fabfile.py b/docker_upgrade_scripts/fabfile.py
deleted file mode 100755 (executable)
index f4c5726..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-from fabric.api import *
-from fabric.context_managers import *
-
-def uptime():
-    res = run('cat /proc/uptime')
-    print res
-
-def host_type():
-       run('uname -s')
-
-def upgrade_docker(server_name, my_env):
-       server_name=server_name.split("-")[1]
-       if server_name in "message-router":
-               execute_file = "/opt/mr_vm_init.sh"
-       elif server_name in "dcae-controller":
-               execute_file = "/opt/dcae2_vm_init.sh"
-       elif server_name in "multiserv-server":
-               execute_file = "/opt/multiserv_all_serv.sh" 
-       elif server_name in "dns":
-               execute_file = None
-       else:
-               execute_file = "/opt/" + server_name + "_vm_init.sh"
-       print "Executing file %s" % execute_file
-       if execute_file:
-               with settings( warn_only=True, key_filename=my_env['key_filename'], user=my_env['user']):
-                       sudo(execute_file)
-
-def health_checks_robot(my_env):
-       with settings( warn_only=True, key_filename=my_env['key_filename'], user=my_env['user']):
-               with cd('/opt'):
-                       sudo('./ete.sh health')
-                       
diff --git a/docker_upgrade_scripts/onap_docker_upgrade.conf b/docker_upgrade_scripts/onap_docker_upgrade.conf
deleted file mode 100644 (file)
index 9b6e527..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-[keystone_auth]
-user = <user_name>
-password = <password>
-tenant = <tenant>
-url = <keystone_url>
-
-[onap]
-instance_prefix = vm1
-
-###Deployment type: 1-nic-nofloat, 1-nic-float, 2-nic
-deployment_type = 1-nic-nofloat
-
-###onap_net_name is required for 1-nic-float and 2-nic environments
-#onap_net_name =
-
-dcae_key_path = <key_for_dcae_component>
-onap_key_path = <key_for_onap_component>
-
-###Nova url is optional and useful when the cloud provider endpoints are internal
-[nova]
-url = <nova_url>
diff --git a/docker_upgrade_scripts/onap_docker_upgrade.py b/docker_upgrade_scripts/onap_docker_upgrade.py
deleted file mode 100755 (executable)
index c11163a..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/python
-
-import argparse
-#import getopt
-import json
-import sys
-import urllib2
-import ConfigParser
-import time
-from fabric.context_managers import settings
-from fabric.api import *
-from fabfile import *
-
-
-class ReadConfFile:
-
-    config = None
-
-    def __init__(self, file="onap_docker_upgrade.conf"):
-
-        """
-        Method to read from conf file specific options
-
-        :param file:
-        """
-        self.config = ConfigParser.SafeConfigParser()
-        self.config.readfp(open(file))
-
-    def read_option(self, group, name):
-        """
-        :return:
-        """
-        value = self.config.get(group, name)
-        return value
-
-
-def getToken(url, osuser, ostenant, ospassword):
-
-    """ 
-    Returns a token to the user given a tenant, 
-    user name, password, and OpenStack API URL. 
-    """
-    url = url + '/tokens'
-    tokenRequest = urllib2.Request(url)
-    tokenRequest.add_header("Content-type", "application/json")
-    jsonPayload = json.dumps({'auth' : {'tenantName' : ostenant, 'passwordCredentials' : {'username' : osuser, 'password' : ospassword}}})
-    
-    request = urllib2.urlopen(tokenRequest, jsonPayload)
-    json_data = json.loads(request.read())
-    
-    request.close()
-    return json.dumps(json_data)
-
-def getServers(url, token):
-    """
-    Returns a list of server in a given tenant
-    """
-    url = url + '/servers'
-    #handler=urllib2.HTTPHandler(debuglevel=1)
-    #opener = urllib2.build_opener(handler)
-    #urllib2.install_opener(opener)
-    nova_server_request = urllib2.Request(url)
-    nova_server_request.add_header("Content-type", "application/json")
-    nova_server_request.add_header("X-Auth-Token", token)
-    request = urllib2.urlopen(nova_server_request)
-    json_data = json.loads(request.read())
-    
-    request.close()
-    return json.dumps(json_data)
-
-def getServerInfo(url, token, server):
-    """
-    Returns the server information in a given tenant
-    """
-    url = url + '/servers/' + server
-    #handler=urllib2.HTTPHandler(debuglevel=1)
-    #opener = urllib2.build_opener(handler)
-    #urllib2.install_opener(opener)
-    nova_server_request = urllib2.Request(url)
-    nova_server_request.add_header("Content-type", "application/json")
-    nova_server_request.add_header("X-Auth-Token", token)
-    request = urllib2.urlopen(nova_server_request)
-    json_data = json.loads(request.read())
-
-    request.close()
-    return json.dumps(json_data)
-
-conf_file = ReadConfFile()
-
-#Reading keystone_auth
-url=conf_file.read_option('keystone_auth', 'url')
-user=conf_file.read_option('keystone_auth', 'user')
-password=conf_file.read_option('keystone_auth', 'password')
-tenant=conf_file.read_option('keystone_auth', 'tenant')
-
-#Reading onap
-instance_prefix=conf_file.read_option('onap', 'instance_prefix')
-deployment_type=conf_file.read_option('onap', 'deployment_type')
-if deployment_type in ("1-nic-float" or "2-nic"):
-       onap_net_name=conf_file.read_option('onap', 'onap_net_name')
-dcae_key_path=conf_file.read_option('onap', 'dcae_key_path')
-onap_key_path=conf_file.read_option('onap', 'onap_key_path')
-
-#Reading nova
-nova_url=conf_file.read_option('nova', 'url')
-    
-# Since we return a raw JSON payload from getToken,
-# we need to load it into a readable object.
-adminToken = json.loads(getToken(url, user, tenant, password))
-
-# Access the token portion of the JSON payload and grab the token and tenant ID
-adminTokenID = adminToken['access']['token']['id']
-adminTokenTenantID = adminToken['access']['token']['tenant']['id']
-
-for item in adminToken['access']['serviceCatalog']:
-    """ 
-    The "name" of each OpenStack service catalog item from
-    the item list changed between versions.  Things like 
-    "glance" became "volume" and "keystone" became "identity".  
-    You will need to update this based on your installation.
-    """
-    if nova_url:
-       adminNovaURL = nova_url + "/" + adminTokenTenantID
-    elif item['name'] == "nova": 
-        adminNovaURL = item['endpoints'][0]['adminURL']
-
-print "------ Admin information ------"
-print "Token ID = ", adminTokenID
-print "Tenant ID = ", adminTokenTenantID
-print "Nova URL = ", adminNovaURL
-print "------ End Admin info ---------"
-
-get_nova_servers = json.loads(getServers(adminNovaURL, adminTokenID))
-#print get_nova_servers
-#print get_nova_servers['servers'][0]['id']
-execute_aai1 = False
-for item in get_nova_servers['servers']:
-       #print item['id'], item['name']
-       if instance_prefix in item['name']:
-               print "Found matching server name: %s with id %s" % (item['name'], item['id'])
-               get_server_info = json.loads(getServerInfo(adminNovaURL, adminTokenID, item['id']))
-               for net_info in get_server_info['server']['addresses']:
-                       if deployment_type in ("1-nic-float" or "2-nic"):
-                               if onap_net_name not in net_info:
-                                       server_ip = get_server_info['server']['addresses'][net_info][0]['addr']
-                       elif deployment_type in "1-nic-nofloat":
-                               server_ip = get_server_info['server']['addresses'][net_info][1]['addr']
-                       server_name = item['name']
-                       if "robot" in server_name:
-                               robot_ip = server_ip
-                       elif "aai-inst1" in server_name:
-                               aai1_ip = server_ip
-                               is_aai2_executed = False
-                               if not is_aai2_executed:
-                                       execute_aai1 = False
-                                       aai1_server_name = server_name
-                               else:
-                                       execute_aai1 = True                     
-                       elif "aai-inst2" in server_name:
-                               aai2_ip = server_ip
-                               is_aai2_executed = True
-                       print "IP address of vm %s is %s" % (item['name'], server_ip)
-
-                       with settings(warnings=True, skip_bad_hosts=True):
-                               if "dcae-controller" in server_name:
-                                       execute(upgrade_docker, server_name, hosts=server_ip, my_env={'key_filename':dcae_key_path, 'user':'ubuntu'})
-                               else:
-                                       if "aai-inst1" not in server_name:
-                                               execute(upgrade_docker, server_name, hosts=server_ip, my_env={'key_filename':onap_key_path, 'user':'ubuntu'})
-                                       elif execute_aai1:
-                                               execute(upgrade_docker, server_name, hosts=server_ip, my_env={'key_filename':onap_key_path, 'user':'ubuntu'})
-                                       else:
-                                               print "Skipping %s upgrade until aai2 finishes upgrade" % server_name
-                       
-with settings(warnings=True):
-       if not execute_aai1:
-               print "Starting %s upgrade" % aai1_ip
-               execute(upgrade_docker, aai1_server_name, hosts=aai1_ip, my_env={'key_filename':onap_key_path, 'user':'ubuntu'})
-       time.sleep(300)
-       execute(health_checks_robot, hosts=robot_ip, my_env={'key_filename':onap_key_path, 'user':'ubuntu'})
diff --git a/pom.xml b/pom.xml
index ebf2cfa..ec9fb16 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,6 @@
   </properties-->
 
   <modules>
-    <module>boot</module>
     <module>vnfs/honeycomb_plugin/parent-pom</module>
     <module>vnfs/vFW/pg_streams</module>
     <module>vnfs/vLB/dns_streams</module>
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
deleted file mode 100755 (executable)
index 67da5fc..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-set -x
-
-########## Define parameters ##########
-source ${WORKSPACE}"/version.properties"
-BRANCH=$(echo ${WORKSPACE} | cut -d'-' -f2)
-if [[ $BRANCH == "master" ]]
-then
-       VERSION=$snapshot_version
-else
-       VERSION=$release_version
-fi
-
-echo "Workspace: " ${WORKSPACE}
-echo "Gerrit branch: " $BRANCH
-echo "Version number: " $VERSION
-
-PATH_TO_PARENT=${WORKSPACE}
-PATH_TO_BOOT=${WORKSPACE}"/boot"
-#PATH_TO_HEAT_MASTER=${WORKSPACE}"/heat/ONAP"
-#PATH_TO_HEAT_VFW=${WORKSPACE}"/heat/vFW"
-#PATH_TO_HEAT_VLB=${WORKSPACE}"/heat/vLB"
-PATH_TO_VFW=${WORKSPACE}"/vnfs/vFW/scripts"
-PATH_TO_VLB=${WORKSPACE}"/vnfs/vLB/scripts"
-PATH_TO_VLBMS=${WORKSPACE}"/vnfs/vLBMS/scripts"
-PATH_TO_VCPE=${WORKSPACE}"/vnfs/vCPE/scripts"
-
-PARENT_GROUP_ID="org.onap.demo"
-BOOT_GROUP_ID=$PARENT_GROUP_ID"/boot"
-#HEAT_MASTER_GROUP_ID=$PARENT_GROUP_ID"/heat/ONAP"
-#HEAT_VFW_GROUP_ID=$PARENT_GROUP_ID"/heat/vFW"
-#HEAT_VLB_GROUP_ID=$PARENT_GROUP_ID"/heat/vLB"
-VFW_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vfw"
-VLB_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vlb"
-VLBMS_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vlbms"
-VCPE_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vcpe"
-
-REPO_URL="https://nexus.onap.org/content/sites/raw"
-USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
-PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
-NETRC=$(mktemp)
-echo "machine nexus.onap.org login ${USER} password ${PASS}" > "${NETRC}"
-####################################################
-
-##### Upload scripts into Nexus raw repository #####
-cd $PATH_TO_PARENT
-curl -vk --netrc-file "${NETRC}" --upload-file README.md $REPO_URL/$PARENT_GROUP_ID/
-curl -vk --netrc-file "${NETRC}" --upload-file LICENSE.TXT $REPO_URL/$PARENT_GROUP_ID/
-
-cd $PATH_TO_BOOT
-ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{}
-
-#cd $PATH_TO_HEAT_MASTER
-#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_MASTER_GROUP_ID/$VERSION/{}
-
-#cd $PATH_TO_HEAT_VFW
-#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_VFW_GROUP_ID/$VERSION/{}
-
-#cd $PATH_TO_HEAT_VLB
-#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_VLB_GROUP_ID/$VERSION/{}
-
-cd $PATH_TO_VFW
-ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{}
-
-cd $PATH_TO_VLB
-ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{}
-
-cd $PATH_TO_VLBMS
-ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLBMS_GROUP_ID/$VERSION/{}
-
-cd $PATH_TO_VCPE
-ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VCPE_GROUP_ID/$VERSION/{}
-####################################################
-
-########## Clean up ##########
-rm ${NETRC}
-##############################
index 2b7fe77..37862c5 100644 (file)
@@ -52,15 +52,9 @@ done
         <debug.parameters>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005</debug.parameters>
         <guice.version>4.1.0</guice.version>
         <guice.config.version>1.2.0</guice.config.version>
-        <!--restconf.version>1.3.2-Beryllium-SR2</restconf.version-->
-        <!--netconf.version>1.0.2-Beryllium-SR2</netconf.version-->
         <jersey.version>1.19.1</jersey.version>
         <jetty.version>9.3.11.v20160721</jetty.version>
         <servlet.version>3.1.0</servlet.version>
-        <!--yangtools.version>0.8.2-Beryllium-SR2</yangtools.version-->
-        <!--mdsal.version>1.3.2-Beryllium-SR2</mdsal.version-->
-        <!-- Used by mdsal as provided/runtime dependency-->
-        <!--osgi.core.version>5.0.0</osgi.core.version-->
     </properties>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/vnfs/honeycomb_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample-distribution/pom.xml
deleted file mode 100755 (executable)
index 02dd1ac..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Modifications copyright Â© 2017 AT&T Intellectual Property
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-<parent>
-    <groupId>org.onap.demo.vnf</groupId>
-    <artifactId>hc-onap</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-    <relativePath>../parent-pom/pom.xml</relativePath>
-</parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>sample-distribution</artifactId>
-
-  <properties>
-      <main.class>io.fd.honeycomb.vpp.integration.distro.Main</main.class>
-      <v3po.version>1.16.9</v3po.version>
-      <lisp.version>1.16.9</lisp.version>
-      <vpp.common.min.distro.version>1.16.9</vpp.common.min.distro.version>
-      <vppnsh.version>1.16.9</vppnsh.version>
-      <honeycomb.infra.version>1.16.9</honeycomb.infra.version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-      </plugin>
-
-<plugin>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-deploy-plugin</artifactId>
-  <configuration>
-    <skip>false</skip>
-  </configuration>
-</plugin>
-
-<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>false</skip>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
-      <artifactId>minimal-distribution</artifactId>
-      <version>${vpp.common.min.distro.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.v3po</groupId>
-      <artifactId>v3po2vpp</artifactId>
-      <version>${v3po.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.lisp</groupId>
-      <artifactId>lisp2vpp</artifactId>
-      <version>${lisp.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.vppnsh</groupId>
-      <artifactId>vppnsh-impl</artifactId>
-      <version>${vppnsh.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.common</groupId>
-      <artifactId>sample-plugin-impl</artifactId>
-      <version>${honeycomb.infra.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.lcmapi</groupId>
-      <artifactId>stream-count-impl</artifactId>
-      <version>${honeycomb.infra.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/vnfs/honeycomb_plugin/sample-distribution/src/main/java/io/fd/honeycomb/tutorial/Main.java b/vnfs/honeycomb_plugin/sample-distribution/src/main/java/io/fd/honeycomb/tutorial/Main.java
deleted file mode 100755 (executable)
index fbcaab8..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Modifications copyright (c) 2019 AT&T Intellectual Property
- */
-
-package io.fd.honeycomb.vpp.integration.distro;
-
-import com.google.common.collect.Lists;
-import com.google.inject.Module;
-import io.fd.honeycomb.lisp.LispModule;
-import io.fd.honeycomb.translate.v3po.V3poModule;
-import io.fd.honeycomb.vpp.distro.VppCommonModule;
-import io.fd.honeycomb.vppnsh.impl.VppNshModule;
-import java.util.List;
-
-public class Main {
-
-    public static void main(String[] args) {
-        final List<Module> sampleModules = Lists.newArrayList(io.fd.honeycomb.infra.distro.Main.BASE_MODULES);
-
-        // All the plugins should be listed here
-        sampleModules.add(new VppCommonModule());
-        sampleModules.add(new V3poModule());
-        sampleModules.add(new LispModule());
-        sampleModules.add(new VppNshModule());
-        sampleModules.add(new io.fd.honeycomb.tutorial.Module());
-        sampleModules.add(new io.fd.honeycomb.lcmapi.Module());
-
-        io.fd.honeycomb.infra.distro.Main.init(sampleModules);
-    }
-}
diff --git a/vnfs/honeycomb_plugin/sample_plugin/LICENSE.TXT b/vnfs/honeycomb_plugin/sample_plugin/LICENSE.TXT
deleted file mode 100644 (file)
index 16285cd..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * ===================================================================
- * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Unless otherwise specified, all software contained herein is
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- *
- * ECOMP is trademark and service mark of AT&T Intellectual Property.
- *
- */
diff --git a/vnfs/honeycomb_plugin/sample_plugin/README.md b/vnfs/honeycomb_plugin/sample_plugin/README.md
deleted file mode 100755 (executable)
index 2719e64..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Honeycomb plugin for VPP's packet generator plugin
-
-This plugin provides REST API to enable/disable streams on the VPP's packet generator. 
-
-
-Buid instructions:
-
-From the sample_pluging folder execute: mvn -s settings.xml clean install.
-
-
-Run instruction:
-
-From the sample_pluging folder execute: ./sample-distribution/target/sample-distribution-1.0.0-hc/sample-distribution-1.0.0/honeycomb
-
-
-In order to allow access to REST API from an external machine, modify the "restconf-binding-address" parameter in sample-distribution/target/sample-distribution-1.0.0-hc/sample-distribution-1.0.0/config/honeycomb.json
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
deleted file mode 100755 (executable)
index 6f35732..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 Cisco and/or its affiliates.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at:
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-    Modifications copyright Â© 2017 AT&T Intellectual Property
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>api-parent</artifactId>
-    <version>1.16.9</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>sample-plugin-api</artifactId>
-  <packaging>bundle</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.8.2-Beryllium-SR2</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>iana-if-type-2014-05-08</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types-20130715</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-interfaces</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
-  </dependencies>
-
-<build>
-<plugins>
-<plugin>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-deploy-plugin</artifactId>
-  <configuration>
-    <skip>true</skip>
-  </configuration>
-</plugin>
-</plugins>
-</build>
-
-</project>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/src/main/yang/sample-plugin.yang b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/src/main/yang/sample-plugin.yang
deleted file mode 100755 (executable)
index df92978..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-//*************************************************************//
-//
-// Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//******************************************************************
-
-
-module sample-plugin {
-
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:sample-plugin";
-    prefix "sample-plugin";
-
-    import ietf-inet-types { prefix "inet"; }
-
-    description
-        "This YANG module defines the generic configuration and
-        operational data for sample-plugin in VPP";
-
-    revision "2016-09-18" {
-        description "Initial revision of sample-plugin model";
-    }
-
-    container sample-plugin {
-        uses sample-plugin-params;
-        description "Configuration data of sample-plugin in Honeycomb";
-
-        // READ
-        // curl -u admin:admin http://localhost:8181/restconf/config/sample-plugin:sample-plugin
-
-        // WRITE
-        // curl http://localhost:8181/restconf/operational/sample-plugin:sample-plugin
-
-    }
-
-    container sample-plugin-state {
-        config false;
-        uses sample-plugin-params;
-        description "Operational data of sample-plugin persisted in VPP";
-
-        // READ
-        // curl -u admin:admin  http://localhost:8181/restconf/operational/sample-plugin:sample-plugin-state
-    }
-
-    grouping sample-plugin-params {
-        container pg-streams {
-            list pg-stream {
-
-                key id;
-                leaf id {
-                    type string;
-                }
-
-                leaf is-enabled {
-                  type boolean;
-                }
-            }
-        }
-    }
-
-    notification sample-notification {
-        leaf content {
-            type string;
-        }
-    }
-}
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/Readme.adoc b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/Readme.adoc
deleted file mode 100755 (executable)
index c3ca794..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
---Documentation for sample-plugin --
-
-TODO Replace with general description whats the purpose of sample-plugin and how it works
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
deleted file mode 100755 (executable)
index 84f48b4..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 Cisco and/or its affiliates.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at:
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-    Modifications copyright Â© 2017 AT&T Intellectual Property
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <groupId>io.fd.honeycomb.common</groupId>
-        <artifactId>impl-parent</artifactId>
-        <version>1.16.9</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>sample-plugin-impl</artifactId>
-    <packaging>bundle</packaging>
-
-    <properties>
-        <honeycomb.infra.version>1.16.9</honeycomb.infra.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.fd.honeycomb.common</groupId>
-            <artifactId>sample-plugin-api</artifactId>
-            <version>${honeycomb.infra.version}</version>
-        </dependency>
-
-        <!-- Honeycomb infrastructure-->
-        <dependency>
-            <groupId>io.fd.honeycomb</groupId>
-            <artifactId>translate-api</artifactId>
-            <version>${honeycomb.infra.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.fd.honeycomb.vpp</groupId>
-            <artifactId>vpp-translate-utils</artifactId>
-            <version>1.16.9</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.fd.honeycomb</groupId>
-            <artifactId>notification-api</artifactId>
-            <version>${honeycomb.infra.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.fd.honeycomb</groupId>
-            <artifactId>translate-spi</artifactId>
-            <version>${honeycomb.infra.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.fd.honeycomb</groupId>
-            <artifactId>cfg-init</artifactId>
-            <version>${honeycomb.infra.version}</version>
-        </dependency>
-
-        <!-- DI -->
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <version>${guice.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.jmob</groupId>
-            <artifactId>guice.conf</artifactId>
-            <version>${guice.config.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <version>${guice.version}</version>
-        </dependency>
-
-        <!-- VPP's core Java APIs -->
-        <dependency>
-            <groupId>io.fd.vpp</groupId>
-            <artifactId>jvpp-core</artifactId>
-            <version>16.09</version>
-        </dependency>
-    </dependencies>
-
-<build>
-<plugins>
-<plugin>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-deploy-plugin</artifactId>
-  <configuration>
-    <skip>true</skip>
-  </configuration>
-</plugin>
-</plugins>
-</build>
-
-</project>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/Module.java b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/Module.java
deleted file mode 100755 (executable)
index 8cd4600..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Modifications copyright (c) 2017 AT&T Intellectual Property
- */
-
-package io.fd.honeycomb.tutorial;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.multibindings.Multibinder;
-import io.fd.honeycomb.data.init.DataTreeInitializer;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.v3po.util.NamingContext;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.tutorial.init.ConfigDataInitializer;
-//import io.fd.honeycomb.tutorial.read.ModuleStateReaderFactory;
-import io.fd.honeycomb.tutorial.write.ModuleWriterFactory;
-import net.jmob.guice.conf.core.ConfigurationModule;
-
-/**
- * Module class instantiating sample-plugin plugin components.
- */
-public final class Module extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        // requests injection of properties
-        install(ConfigurationModule.create());
-        requestInjection(ModuleConfiguration.class);
-
-        // bind naming context instance for reader and writer factories
-        // the first parameter is artificial name prefix in cases a name needs to be reconstructed for a vxlan tunnel
-        // that is present in VPP but not in Honeycomb (could be extracted into configuration)
-        // the second parameter is just the naming context ID (could be extracted into configuration)
-        binder().bind(NamingContext.class).toInstance(new NamingContext("pgstream", "pgstream-context"));
-
-        // creates reader factory binding
-        // can hold multiple binding for separate yang modules
-      //  final Multibinder<ReaderFactory> readerFactoryBinder = Multibinder.newSetBinder(binder(), ReaderFactory.class);
-      //  readerFactoryBinder.addBinding().to(ModuleStateReaderFactory.class);
-
-        // create writer factory binding
-        // can hold multiple binding for separate yang modules
-        final Multibinder<WriterFactory> writerFactoryBinder = Multibinder.newSetBinder(binder(), WriterFactory.class);
-        writerFactoryBinder.addBinding().to(ModuleWriterFactory.class);
-
-        // create initializer binding
-        // can hold multiple binding for separate yang modules
-        final Multibinder<DataTreeInitializer> initializerBinder =
-                Multibinder.newSetBinder(binder(), DataTreeInitializer.class);
-        initializerBinder.addBinding().to(ConfigDataInitializer.class);
-
-        // Disable notification producer for now
-//        Multibinder.newSetBinder(binder(), ManagedNotificationProducer.class).addBinding()
-//                .to(SampleNotificationProducer.class);
-    }
-}
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/ModuleConfiguration.java b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/ModuleConfiguration.java
deleted file mode 100755 (executable)
index ef6be6e..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.tutorial;
-
-import net.jmob.guice.conf.core.BindConfig;
-import net.jmob.guice.conf.core.InjectConfig;
-import net.jmob.guice.conf.core.Syntax;
-
-/**
- * Class containing static configuration for sample-plugin module,<br>
- * either loaded from property file sample-plugin.json from classpath.
- * <p/>
- * Further documentation for the configuration injection can be found at:
- * https://github.com/yyvess/gconf
- */
-@BindConfig(value = "sample-plugin", syntax = Syntax.JSON)
-public final class ModuleConfiguration {
-
-    // TODO change the sample property to real plugin configuration
-    // If there is no such configuration, remove this, sample-plugin.json resource and its wiring from Module class
-
-    /**
-     * Sample property that's injected from external json configuration file.
-     */
-    @InjectConfig("sample-prop")
-    public String sampleProp;
-
-    /**
-     * Constant name used to identify sample-plugin plugin specific components during dependency injection.
-     */
-    public static final String ELEMENT_SERVICE_NAME = "element-service";
-}
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/init/ConfigDataInitializer.java b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/init/ConfigDataInitializer.java
deleted file mode 100755 (executable)
index 8a7f4d1..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.tutorial.init;
-
-import io.fd.honeycomb.data.init.AbstractDataTreeConverter;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.SamplePlugin;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.SamplePluginBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.SamplePluginState;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-/**
- * Initialize configuration data based on operational data.
- * <p/>
- * Very useful when a plugin is initiated but the underlying layer already contains some operation state.
- * Deriving the configuration from existing operational state enables reconciliation in case when Honeycomb's persistence
- * is not available to do the work for us.
- */
-public final class ConfigDataInitializer extends AbstractDataTreeConverter<SamplePluginState, SamplePlugin> {
-
-    @Inject
-    public ConfigDataInitializer(@Named("honeycomb-initializer") @Nonnull final DataBroker bindingDataBroker) {
-        super(bindingDataBroker, InstanceIdentifier.create(SamplePluginState.class), InstanceIdentifier.create(SamplePlugin.class));
-    }
-
-    @Override
-    public SamplePlugin convert(final SamplePluginState operationalData) {
-        // Transfer all the operational data into configuration
-        return new SamplePluginBuilder()
-                .setPgStreams(operationalData.getPgStreams())
-                .build();
-    }
-}
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/notif/SampleNotificationProducer.java b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/notif/SampleNotificationProducer.java
deleted file mode 100755 (executable)
index 6ae1394..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.tutorial.notif;
-
-import io.fd.honeycomb.notification.ManagedNotificationProducer;
-import io.fd.honeycomb.notification.NotificationCollector;
-import java.util.Collection;
-import java.util.Collections;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.SampleNotification;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.SampleNotificationBuilder;
-import org.opendaylight.yangtools.yang.binding.Notification;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Notification producer for sample plugin
- */
-public class SampleNotificationProducer implements ManagedNotificationProducer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(SampleNotificationProducer.class);
-
-    private Thread thread;
-
-    @Override
-    public void start(@Nonnull final NotificationCollector collector) {
-        LOG.info("Starting notification stream for interfaces");
-
-        // Simulating notification producer
-        thread = new Thread(() -> {
-            while(true) {
-                if (Thread.currentThread().isInterrupted()) {
-                    return;
-                }
-
-                try {
-                    Thread.sleep(2000);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    break;
-                }
-
-                final SampleNotification notification = new SampleNotificationBuilder()
-                        .setContent("Hello world " + System.currentTimeMillis())
-                        .build();
-                LOG.info("Emitting notification: {}", notification);
-                collector.onNotification(notification);
-            }
-        }, "NotificationProducer");
-        thread.setDaemon(true);
-        thread.start();
-    }
-
-    @Override
-    public void stop() {
-        if(thread != null) {
-            thread.interrupt();
-        }
-    }
-
-    @Nonnull
-    @Override
-    public Collection<Class<? extends Notification>> getNotificationTypes() {
-        // Producing only this single type of notification
-        return Collections.singleton(SampleNotification.class);
-    }
-
-    @Override
-    public void close() throws Exception {
-        stop();
-    }
-}
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/write/ModuleWriterFactory.java b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/write/ModuleWriterFactory.java
deleted file mode 100755 (executable)
index ad7669b..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Modifications copyright (c) 2017 AT&T Intellectual Property
- */
-package io.fd.honeycomb.tutorial.write;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.translate.impl.write.GenericWriter;
-import io.fd.honeycomb.translate.v3po.util.NamingContext;
-import io.fd.honeycomb.translate.write.WriterFactory;
-import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.SamplePlugin;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.sample.plugin.params.PgStreams;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.sample.plugin.params.pg.streams.PgStream;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.openvpp.jvpp.core.future.FutureJVppCore;
-
-/**
- * Factory producing writers for sample-plugin plugin's data.
- */
-public final class ModuleWriterFactory implements WriterFactory {
-
-    private static final InstanceIdentifier<SamplePlugin> ROOT_CONTAINER_ID = InstanceIdentifier.create(SamplePlugin.class);
-
-    /**
-     * Injected vxlan naming context shared with writer, provided by this plugin
-     */
-    @Inject
-    private NamingContext pgNamingContext;
-    /**
-     * Injected jvpp core APIs, provided by Honeycomb's infrastructure
-     */
-    @Inject
-    private FutureJVppCore jvppCore;
-
-    @Override
-    public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) {
-        // Unlike ReaderFactory, there's no need to add structural writers, just the writers that actually do something
-
-        // register writer for vxlan tunnel
-        registry.add(new GenericWriter<>(
-                // What part of subtree this writer handles is identified by an InstanceIdentifier
-                ROOT_CONTAINER_ID.child(PgStreams.class).child(PgStream.class),
-                // Customizer (the actual translation code to do the heavy lifting)
-                new PgWriteCustomizer(jvppCore, pgNamingContext)));
-    }
-}
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/write/PgWriteCustomizer.java b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/src/main/java/io/fd/honeycomb/tutorial/write/PgWriteCustomizer.java
deleted file mode 100755 (executable)
index 7a146f6..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
- /*
- * Modifications copyright (c) 2017 AT&T Intellectual Property
- */
-
-package io.fd.honeycomb.tutorial.write;
-
-import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.v3po.util.NamingContext;
-import io.fd.honeycomb.translate.v3po.util.TranslateUtils;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.sample.plugin.params.pg.streams.PgStream;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.sample.plugin.rev160918.sample.plugin.params.pg.streams.PgStreamKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.openvpp.jvpp.VppBaseCallException;
-import org.openvpp.jvpp.core.dto.PgEnableDisable;
-import org.openvpp.jvpp.core.dto.PgEnableDisableReply;
-import org.openvpp.jvpp.core.future.FutureJVppCore;
-
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Writer for {@link VxlanTunnel} list node from our YANG model.
- */
-public final class PgWriteCustomizer implements ListWriterCustomizer<PgStream, PgStreamKey> {
-
-
-    private static final Logger LOG = LoggerFactory.getLogger(PgWriteCustomizer.class);
-
-    /**
-     * JVpp APIs
-     */
-    private final FutureJVppCore jvppCore;
-    /**
-     * Shared vxlan tunnel naming context
-     */
-    private final NamingContext pgStreamNamingContext;
-
-    public PgWriteCustomizer(final FutureJVppCore jvppCore, final NamingContext pgStreamNamingContext) {
-        this.jvppCore = jvppCore;
-        this.pgStreamNamingContext = pgStreamNamingContext;
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<PgStream> id,
-                                       @Nonnull final PgStream dataAfter,
-                                       @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        // Create and set vxlan tunnel add request
-        final PgEnableDisable pgEnableDisable = new PgEnableDisable();
-        // 1 for add, 0 for delete
-        //look into this file: ~/vpp/build-root/build-vpp-native/vpp-api/java/jvpp-core/org/openvpp/jvpp/core/dto/PgEnableDisable.java
-        pgEnableDisable.isEnabled = 1;//public byte
-        String sName = dataAfter.getId();
-        //pgEnableDisable.streamName = sName.getBytes();//public byte[]
-        byte[] tempArray = sName.getBytes();
-        LOG.info("Going to copy array!!!");
-        String tempMsg = "";
-        pgEnableDisable.streamName = new byte[tempArray.length+1];
-        for(int i = 0; i < tempArray.length; i++){
-             tempMsg = "copying: i= "+i+" value: "+tempArray[i];
-             LOG.info(tempMsg);
-             pgEnableDisable.streamName[i] = tempArray[i];
-        }
-
-        //System.arraycopy( sName.getBytes(), 0, pgEnableDisable.streamName, 0, sName.length());
-        pgEnableDisable.streamNameLength = sName.length() + 1;//public int
-        String logMsg = "######***** Enabling: "+sName+" len: "+sName.length()+" getBytes:" + Arrays.toString(pgEnableDisable.streamName);
-        LOG.info(logMsg);
-        // dataAfter is the new vxlanTunnel configuration
-        //final boolean isIpv6 = dataAfter.getSrc().getIpv6Address() != null;
-        //vxlanAddDelTunnel.isIpv6 = TranslateUtils.booleanToByte(isIpv6);
-        //vxlanAddDelTunnel.srcAddress = TranslateUtils.ipAddressToArray(isIpv6, dataAfter.getSrc());
-        //vxlanAddDelTunnel.dstAddress = TranslateUtils.ipAddressToArray(isIpv6, dataAfter.getDst());
-        // There are other input parameters that are not exposed by our YANG model, default values will be used
-
-        try {
-            final PgEnableDisableReply replyForWrite = TranslateUtils
-                    .getReplyForWrite(jvppCore.pgEnableDisable(pgEnableDisable).toCompletableFuture(), id);
-
-            // VPP returns the index of new vxlan tunnel
-            //final int newVxlanTunnelIndex = replyForWrite.swIfIndex;
-            // It's important to store it in context so that reader knows to which name a vxlan tunnel is mapped
-            pgStreamNamingContext.addName(1, dataAfter.getId(), writeContext.getMappingContext());
-        } catch (VppBaseCallException e) {
-            throw new WriteFailedException.CreateFailedException(id, dataAfter, e);
-        }
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<PgStream> id,
-                                        @Nonnull final PgStream dataBefore,
-                                        @Nonnull final PgStream dataAfter, @Nonnull final WriteContext writeContext)
-            throws WriteFailedException {
-        // Not supported at VPP API level, throw exception
-        throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter,
-                new UnsupportedOperationException("Vxlan tunnel update is not supported by VPP"));
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<PgStream> id,
-                                        @Nonnull final PgStream dataBefore,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        // Create and set vxlan tunnel add request
-        //final VxlanAddDelTunnel vxlanAddDelTunnel = new VxlanAddDelTunnel();
-        final PgEnableDisable pgEnableDisable = new PgEnableDisable();
-        // 1 for add, 0 for delete
-        //vxlanAddDelTunnel.isAdd = 0;
-        pgEnableDisable.isEnabled = 0;//public byte
-
-        String sName = dataBefore.getId();
-        pgEnableDisable.streamName = sName.getBytes();//public byte[]
-        pgEnableDisable.streamNameLength = sName.length()+1;//public int
-
-        String logMsg1 = "***** Disabling: "+sName+" len: "+sName.length()+" getBytes:" + Arrays.toString(pgEnableDisable.streamName);
-        LOG.info(logMsg1);
-        // Vxlan tunnel is identified by its attributes when deleting, not index, so set all attributes
-        // dataBefore is the vxlan tunnel that's being deleted
-        //final boolean isIpv6 = dataBefore.getSrc().getIpv6Address() != null;
-        //vxlanAddDelTunnel.isIpv6 = TranslateUtils.booleanToByte(isIpv6);
-        //vxlanAddDelTunnel.srcAddress = TranslateUtils.ipAddressToArray(isIpv6, dataBefore.getSrc());
-        //vxlanAddDelTunnel.dstAddress = TranslateUtils.ipAddressToArray(isIpv6, dataBefore.getDst());
-        // There are other input parameters that are not exposed by our YANG model, default values will be used
-
-        try {
-           // final VxlanAddDelTunnelReply replyForWrite = TranslateUtils
-           //         .getReplyForWrite(jvppCore.vxlanAddDelTunnel(vxlanAddDelTunnel).toCompletableFuture(), id);
-          final PgEnableDisableReply replyForWrite = TranslateUtils
-                    .getReplyForWrite(jvppCore.pgEnableDisable(pgEnableDisable).toCompletableFuture(), id);
-           // It's important to remove the mapping from context
-           pgStreamNamingContext.removeName(dataBefore.getId(), writeContext.getMappingContext());
-        } catch (VppBaseCallException e) {
-            throw new WriteFailedException.DeleteFailedException(id, e);
-        }
-    }
-}