Even more unit test and code cleanup

[dmaap/datarouter.git] / README.md

diff --git a/README.md b/README.md
index 778a35d..56d29bb 100644 (file)
--- a/README.md
+++ b/README.md
@@ -117,11 +117,11 @@ Curl Commands to test:
 \r
 create a feed:\r
 \r
-curl -v -X POST -H "Content-Type : application/vnd.att-dr.feed" -H "X-ATT-DR-ON-BEHALF-OF: rs873m" --data-ascii @/opt/app/datartr/addFeed3.txt --post301 --location-trusted  -k https://dmaap-dr-prov:8443\r
+curl -v -X POST -H "Content-Type : application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF: rs873m" --data-ascii @/opt/app/datartr/addFeed3.txt --post301 --location-trusted  -k https://dmaap-dr-prov:8443\r
 \r
 Subscribe to feed:\r
 \r
-curl -v -X POST -H "Content-Type: application/vnd.att-dr.subscription" -H "X-ATT-DR-ON-BEHALF-OF: rs873m" --data-ascii @/opt/app/datartr/addSubscriber.txt --post301 --location-trusted -k https://dmaap-dr-prov:8443/subscribe/1\r
+curl -v -X POST -H "Content-Type: application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF: rs873m" --data-ascii @/opt/app/datartr/addSubscriber.txt --post301 --location-trusted -k https://dmaap-dr-prov:8443/subscribe/1\r
 \r
 Publish to feed:\r
 \r
@@ -144,4 +144,44 @@ MariaDB - 10.2.14
 \r
 Self Signed SSL certificates\r
 \r
+## This section describes how to build and test datarouter containers on a host such as\r
+a laptop or remote server.\r
+\r
+- Install git, maven, docker\r
+    - See https://wiki.onap.org/display/DW/Setting+Up+Your+Development+Environment\r
+    - See https://docs.docker.com/install/\r
+\r
+### Build\r
+- in terminal \r
+> git clone https://gerrit.onap.org/r/dmaap/datarouter\r
+> cd datarouter\r
+> mvn clean install -DskipTests -Pdocker\r
+> docker images\r
+REPOSITORY                                               TAG                 IMAGE ID            CREATED             SIZE\r
+nexus3.onap.org:10003/onap/dmaap/datarouter-subscriber   2.0.0-SNAPSHOT      0dfc99a7612c        13 seconds ago      99.2MB\r
+nexus3.onap.org:10003/onap/dmaap/datarouter-subscriber   latest              0dfc99a7612c        13 seconds ago      99.2MB\r
+nexus3.onap.org:10003/onap/dmaap/datarouter-node         2.0.0-SNAPSHOT      6573f4bdc310        27 seconds ago      116MB\r
+nexus3.onap.org:10003/onap/dmaap/datarouter-node         latest              6573f4bdc310        27 seconds ago      116MB\r
+nexus3.onap.org:10003/onap/dmaap/datarouter-prov         2.0.0-SNAPSHOT      9e4148737c18        47 seconds ago      148MB\r
+nexus3.onap.org:10003/onap/dmaap/datarouter-prov         latest              9e4148737c18        47 seconds ago      148MB\r
+openjdk                                                  8-jre-alpine        1b46cc2ba839        3 weeks ago         85MB\r
+nexus3.onap.org:10001/openjdk                            8-jre-alpine        1b46cc2ba839        3 weeks ago         85MB\r
+\r
+### Test\r
+> cd datarouter-docker-compose/src/main/resources\r
+- edit docker-compose, change nexus 0001 (remote pull repo) to 0003 (local build)\r
+> docker-compose up\r
+\r
+- terminal 2\r
+>  docker container ls -a\r
+CONTAINER ID        IMAGE                                                    COMMAND                  CREATED              STATUS                        PORTS                                                                   NAMES\r
+c193317ec860        nexus3.onap.org:10003/onap/dmaap/datarouter-node         "sh startup.sh"          About a minute ago   Up About a minute             0.0.0.0:9090->8080/tcp, 0.0.0.0:9443->8443/tcp                          datarouter-node\r
+e8dab741550e        nexus3.onap.org:10003/onap/dmaap/datarouter-prov         "sh startup.sh"          About a minute ago   Up About a minute (healthy)   0.0.0.0:8080->8080/tcp, 0.0.0.0:8443->8443/tcp, 0.0.0.0:443->8443/tcp   datarouter-prov\r
+cf0e996f0f31        nexus3.onap.org:10003/onap/dmaap/datarouter-subscriber   "sh startup.sh"          About a minute ago   Up About a minute             8080/tcp, 0.0.0.0:7070->7070/tcp, 8443/tcp                              subscriber-node\r
+73affb6364f9        mariadb:10.2.14                                          "docker-entrypoint.s…"   About a minute ago   Up About a minute (healthy)   0.0.0.0:3306->3306/tcp                                                  mariadb\r
+\r
+> docker exec -it datarouter-node /bin/sh\r
+    # curl http://dmaap-dr-prov:8080/internal/prov\r
+> docker exec -it datarouter-prov /bin/sh\r
+    # curl -v -X POST -H "Content-Type : application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF: rs873m" --data-ascii @/opt/app/datartr/addFeed3.txt --post301 --location-trusted  -k https://dmaap-dr-prov:8443\r
 \r