added updated code for test env

Change-Id: I099e51de42ae531897b3f959df601045e108e791
Signed-off-by: Rohan Patel <rp5811@att.com>

diff --git a/otf-camunda/docker/Dockerfile b/otf-camunda/docker/Dockerfile
index 4df636c..d63564e 100644 (file)
--- a/otf-camunda/docker/Dockerfile
+++ b/otf-camunda/docker/Dockerfile
@@ -7,10 +7,10 @@ ENV EXECUTORS_ACTIVE=true
 ENV OTF_MONGO_USERNAME=username\r
 ENV OTF_MONGO_PASSWORD=password\r
 ENV OTF_MONGO_HOSTS=localhost:27017\r
-ENV OTF_MONGO_REPLICASET=mongoOTF\r
+ENV OTF_MONGO_REPLICASET=rs0\r
 ENV OTF_MONGO_DATABASE=otf\r
-ENV OTF_CAMUNDA_DB_URL=localhost:3306/otf-camunda\r
-ENV OTF_CAMUNDA_DB_USERNAME=username\r
+ENV OTF_CAMUNDA_DB_URL=localhost:3306/camunda\r
+ENV OTF_CAMUNDA_DB_USERNAME=root\r
 ENV OTF_CAMUNDA_DB_PASSWORD=password\r
 ENV AAF_PERM_TYPE=type\r
 ENV CADI_HOSTNAME=localhost\r

diff --git a/otf-camunda/pom.xml b/otf-camunda/pom.xml
index 4fa0994..ad4deb3 100644 (file)
--- a/otf-camunda/pom.xml
+++ b/otf-camunda/pom.xml
@@ -74,7 +74,7 @@
     </dependency>\r
     <dependency>\r
       <groupId>org.camunda.bpm.springboot</groupId>\r
-      <artifactId>camunda-bpm-spring-boot-starter-webapp-ee</artifactId>\r
+      <artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>\r
       <version>${camunda.springboot.version}</version>\r
     </dependency>\r
     <dependency>\r
@@ -292,12 +292,12 @@
 \r
     <cadi.version>2.1.10</cadi.version>\r
     <docker.registry>registry.hub.docker.io</docker.registry>\r
-    <camunda.version>7.10.0-ee</camunda.version>\r
+    <camunda.version>7.10.0</camunda.version>\r
     <camunda.bpm.assert.version>2.0-alpha2</camunda.bpm.assert.version>\r
     <camunda.bpm.base.version>7.10.0</camunda.bpm.base.version>\r
     <camunda.bpm.mail.version>1.1.0</camunda.bpm.mail.version>\r
     <camunda.bpm.reactor.version>2.1.2</camunda.bpm.reactor.version>\r
-    <camunda.bpm.version>7.10.4-ee</camunda.bpm.version>\r
+    <camunda.bpm.version>7.10.4</camunda.bpm.version>\r
     <camunda.bpm.external-task-client.version>1.1.1</camunda.bpm.external-task-client.version>\r
     <camunda.mockito.version>3.2.1</camunda.mockito.version>\r
     <camunda.spin.version>1.6.6</camunda.spin.version>\r

diff --git a/otf-frontend/Dockerfile b/otf-frontend/Dockerfile
index a3fd845..6caf80d 100644 (file)
--- a/otf-frontend/Dockerfile
+++ b/otf-frontend/Dockerfile
@@ -16,7 +16,7 @@ ENV CAMUNDAAPI_AAFID=username
 ENV CAMUNDAAPI_AAFPASSWORD=password\r
 ENV MONGO_BASEURL=localhost:27017/\r
 ENV MONGO_DBOTF=otf\r
-ENV MONGO_REPLICASET=mongoOTF\r
+ENV MONGO_REPLICASET=rs0\r
 ENV MONGO_USERNAME=username\r
 ENV MONGO_PASSWORD=password\r
 \r

diff --git a/otf-frontend/package.json b/otf-frontend/package.json
index 84fa16d..2971bcb 100644 (file)
--- a/otf-frontend/package.json
+++ b/otf-frontend/package.json
@@ -25,7 +25,7 @@
     "test-ci": "TEST_CI=true ng test",\r
     "lint": "ng lint",\r
     "e2e": "ng e2e",\r
-    "postinstall": "ng add ng-cli-pug-loader@0.1.7 && node ./ng-add-pug-loader.js"\r
+    "postinstall": "ng add ng-cli-pug-loader@0.1.7"\r
   },\r
   "directories": {\r
     "lib": "server/src/feathers"\r

diff --git a/otf-frontend/server/src/feathers/services/bpmn-validate/bpmn-validate.class.js b/otf-frontend/server/src/feathers/services/bpmn-validate/bpmn-validate.class.js
index 8b969bc..d855145 100644 (file)
--- a/otf-frontend/server/src/feathers/services/bpmn-validate/bpmn-validate.class.js
+++ b/otf-frontend/server/src/feathers/services/bpmn-validate/bpmn-validate.class.js
@@ -249,7 +249,7 @@ class Service {
                        }\r
                };\r
                let options = {\r
-                       url: 'https://localhost/' + this.options.app.get('base-path') + 'file-transfer',\r
+                       url: this.options.app.get('otf').url + this.options.app.get('base-path') + 'file-transfer',\r
                        headers: {\r
                                'Authorization': params.headers.Authorization,\r
                                'Content-Type': "multipart/form-data"\r

diff --git a/otf-frontend/server/src/feathers/services/jobs/jobs.hooks.js b/otf-frontend/server/src/feathers/services/jobs/jobs.hooks.js
index f119833..eec6d19 100644 (file)
--- a/otf-frontend/server/src/feathers/services/jobs/jobs.hooks.js
+++ b/otf-frontend/server/src/feathers/services/jobs/jobs.hooks.js
@@ -119,7 +119,7 @@ module.exports = {
                        (context) => { console.log("AFTER PERMISSIONS")},\r
                        canExecute(), \r
                        async (context) => {\r
-                               const fullUrl = 'https://localhost/' + context.app.get('base-path') + 'schedule-test';\r
+                               const fullUrl = this.options.app.get('otf').url + context.app.get('base-path') + 'schedule-test';\r
 \r
                                context.data.executorId = context.params.user._id;\r
 \r
@@ -155,7 +155,7 @@ module.exports = {
                        permissions('jobs'),\r
                        canExecute(),\r
                        async function (context) {\r
-                       const fullUrl = 'https://localhost/' + context.app.get('base-path') + 'cancel-test';\r
+                       const fullUrl = this.options.app.get('otf').url + context.app.get('base-path') + 'cancel-test';\r
 \r
                        if (context.id == null || context.params.user._id == null ||\r
                                utils.isValidObjectId(context.id) || utils.isValidObjectId(context.params.user._id)) {\r

diff --git a/otf-installation.txt b/otf-installation.txt
new file mode 100644 (file)
index 0000000..f40437b
--- /dev/null
+++ b/otf-installation.txt
@@ -0,0 +1,67 @@
+docker login nexus3.onap.org:10001\r
+   docker | docker\r
+\r
+APP PORT MAPPINGS              Internal-k8s            External-k8s    Docker\r
+otf-frontend                   443                                     32524                   8082\r
+otf-service-api                        8443                            32303                   8081\r
+otf-camunda                            8443                            31313                   8080\r
+otf-ping-test-head             5000                            32223                   5001\r
+otf-ssh-test-head              5000                            32222                   5002\r
+otf-robot-test-head            5000                            32224                   5003\r
+\r
+otf-ping-test-head\r
+   comment app.run for ssl\r
+   uncomment app.run without ssl   \r
+   change port if needed\r
+   docker build -t otf-ping-test-head:0.0.1-SNAPSHOT .\r
+   docker run -d --network="host" otf-ping-test-head:0.0.1-SNAPSHOT\r
+\r
+otf-ssh-test-head\r
+   comment app.run for ssl\r
+   uncomment app.run without ssl   \r
+   change port if needed\r
+   docker build -t otf-ssh-test-head:0.0.1-SNAPSHOT .\r
+   docker run -d --network="host" otf-ssh-test-head:0.0.1-SNAPSHOT\r
+\r
+otf-robot-test-head\r
+   comment app.run for ssl\r
+   uncomment app.run without ssl   \r
+   change port if needed\r
+   docker build -t otf-robot-test-head:0.0.1-SNAPSHOT .\r
+   docker run -d --network="host" otf-robot-test-head:0.0.1-SNAPSHOT\r
+\r
+\r
+otf-frontend\r
+   \r
+\r
+otf-service-api\r
+  Modify src/main/resources/application.properties according to needs (disable aaf/ssl, set ports)\r
+  Add settings.xml from onap website and add profile to use maven default repository and add settings.xml to ~/.m2/ if missing\r
+  mvn clean install (add flag -DskipTests if it causes the build to fail)\r
+  navigate to target folder and run "docker build -t otf-service-api:0.0.1-SNAPSHOT ."\r
+  docker run -d --network="host" otf-service-api:0.0.1-SNAPSHOT\r
+\r
+\r
+otf-camunda\r
+  Modify src/main/resources/application.yaml according to needs, and validate the yaml is correct format (disable aaf/ssl, set ports)\r
+  Add settings.xml from onap website and add profile to use maven default repository and add settings.xml to ~/.m2/ if missing\r
+  mvn clean install (add flag -DskipTests if it causes the build to fail)\r
+  navigate to target folder and run "docker build -t otf-camunda:0.0.1-SNAPSHOT ."\r
+  docker run -d --network="host" otf-camunda:0.0.1-SNAPSHOT\r
+\r
+Database Notes\r
+  run sudo installdbs.sh and export PATH=/usr/local/mysql/bin:$PATH to add mysql commands to path\r
+  run sudo createMongoUser.sh\r
+  edit mongo to create a replica set by modifying replication and net fields on file /etc/mongod.conf\r
+    add security: authorization: 'enabled'\r
+  after script is ran mysql should be able to be used, connect to mysql using the password set by script and mysql command and\r
+    alter the root password\r
+      alter user 'root'@'localhost' identified by 'new_password'\r
+    grant root ability to connect remotely\r
+      grant all on *.* to 'root'@'%' identified by 'password'\r
+    create db and exit mysql shell\r
+      create database 'new_db'\r
+    create tables using mysql scripts\r
+      mysql -u root -p db < engine.sql\r
+      mysql -u root -p db < identity.sql\r
+\r

diff --git a/otf-robot-test-head/Dockerfile b/otf-robot-test-head/Dockerfile
index 95b7c2b..ce801b7 100644 (file)
--- a/otf-robot-test-head/Dockerfile
+++ b/otf-robot-test-head/Dockerfile
@@ -10,9 +10,10 @@ ENV APP_NAME=otf-robot-test-head
 ENV APP_VERSION=1.0\r
 ENV OTF_MONGO_HOSTS=localhost:27017/\r
 ENV OTF_MONGO_DATABASE=otf\r
-ENV OTF_MONGO_REPLICASET=mongoOTF\r
+ENV OTF_MONGO_REPLICASET=rs0\r
 ENV OTF_MONGO_USERNAME=username\r
 ENV OTF_MONGO_PASSWORD=password\r
+ENV APP_SETTINGS=app.configuration.DevelopmentConfiguration\r
 \r
 RUN python --version\r
 \r

diff --git a/otf-service-api/docker/Dockerfile b/otf-service-api/docker/Dockerfile
index e0e9e53..d1ef755 100644 (file)
--- a/otf-service-api/docker/Dockerfile
+++ b/otf-service-api/docker/Dockerfile
@@ -12,7 +12,7 @@ ENV APP_VERSION=1.0
 ENV OTF_MONGO_HOSTS=localhost:27017\r
 ENV OTF_MONGO_USERNAME=username\r
 ENV OTF_MONGO_PASSWORD=password\r
-ENV OTF_MONGO_REPLICASET=mongoOTF\r
+ENV OTF_MONGO_REPLICASET=rs0\r
 ENV OTF_MONGO_DATABASE=otf\r
 ENV otf.camunda.host=https://localhost\r
 ENV otf.camunda.port=31313\r

diff --git a/otf-service-api/pom.xml b/otf-service-api/pom.xml
index fda9ed3..46b4b21 100644 (file)
--- a/otf-service-api/pom.xml
+++ b/otf-service-api/pom.xml
@@ -302,7 +302,7 @@
     <dependency>\r
       <artifactId>httpmime</artifactId>\r
       <groupId>org.apache.httpcomponents</groupId>\r
-      <version>4.5.7-SNAPSHOT</version>\r
+      <version>4.5.7</version>\r
     </dependency>\r
 \r
     <dependency>\r

diff --git a/settings.xml b/settings.xml
new file mode 100644 (file)
index 0000000..5a4325d
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,215 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"\r
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">\r
+\r
+  <localRepository>/home/YOURUSERID/onap/.m2/repository</localRepository>\r
+\r
+  <profiles>\r
+    <profile>\r
+      <id>openecomp-staging</id>\r
+      <repositories>\r
+        <repository>\r
+          <id>openecomp-staging</id>\r
+          <name>openecomp-staging</name>\r
+          <url>https://nexus.onap.org/content/repositories/staging/</url>\r
+          <releases>\r
+            <enabled>true</enabled>\r
+            <updatePolicy>never</updatePolicy>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>false</enabled>\r
+          </snapshots>\r
+        </repository>\r
+      </repositories>\r
+      <pluginRepositories>\r
+        <pluginRepository>\r
+          <id>openecomp-staging</id>\r
+          <name>openecomp-staging</name>\r
+          <url>https://nexus.onap.org/content/repositories/staging/</url>\r
+          <releases>\r
+            <enabled>true</enabled>\r
+            <updatePolicy>never</updatePolicy>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>false</enabled>\r
+          </snapshots>\r
+        </pluginRepository>\r
+      </pluginRepositories>\r
+    </profile>\r
+    <profile>\r
+      <id>openecomp-public</id>\r
+      <repositories>\r
+        <repository>\r
+          <id>openecomp-public</id>\r
+          <name>openecomp-public</name>\r
+          <url>https://nexus.onap.org/content/repositories/public/</url>\r
+          <releases>\r
+            <enabled>true</enabled>\r
+            <updatePolicy>never</updatePolicy>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>false</enabled>\r
+          </snapshots>\r
+        </repository>\r
+      </repositories>\r
+      <pluginRepositories>\r
+        <pluginRepository>\r
+          <id>openecomp-public</id>\r
+          <name>openecomp-public</name>\r
+          <url>https://nexus.onap.org/content/repositories/public/</url>\r
+          <releases>\r
+            <enabled>true</enabled>\r
+            <updatePolicy>never</updatePolicy>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>false</enabled>\r
+          </snapshots>\r
+        </pluginRepository>\r
+      </pluginRepositories>\r
+    </profile>\r
+    <profile>\r
+      <id>openecomp-release</id>\r
+      <repositories>\r
+        <repository>\r
+          <id>openecomp-release</id>\r
+          <name>openecomp-release</name>\r
+          <url>https://nexus.onap.org/content/repositories/releases/</url>\r
+          <releases>\r
+            <enabled>true</enabled>\r
+            <updatePolicy>never</updatePolicy>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>false</enabled>\r
+          </snapshots>\r
+        </repository>\r
+      </repositories>\r
+      <pluginRepositories>\r
+        <pluginRepository>\r
+          <id>openecomp-release</id>\r
+          <name>openecomp-release</name>\r
+          <url>https://nexus.onap.org/content/repositories/releases/</url>\r
+          <releases>\r
+            <enabled>true</enabled>\r
+            <updatePolicy>never</updatePolicy>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>false</enabled>\r
+          </snapshots>\r
+        </pluginRepository>\r
+      </pluginRepositories>\r
+    </profile>\r
+\r
+    <profile>\r
+      <id>openecomp-snapshots</id>\r
+      <repositories>\r
+        <repository>\r
+          <id>openecomp-snapshot</id>\r
+          <name>openecomp-snapshot</name>\r
+          <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
+          <releases>\r
+            <enabled>false</enabled>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>true</enabled>\r
+          </snapshots>\r
+        </repository>\r
+      </repositories>\r
+      <pluginRepositories>\r
+        <pluginRepository>\r
+          <id>openecomp-snapshot</id>\r
+          <name>openecomp-snapshot</name>\r
+          <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
+          <releases>\r
+            <enabled>false</enabled>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>true</enabled>\r
+          </snapshots>\r
+        </pluginRepository>\r
+      </pluginRepositories>\r
+    </profile>\r
+    <profile>\r
+      <id>opendaylight-release</id>\r
+      <repositories>\r
+        <repository>\r
+          <id>opendaylight-mirror</id>\r
+          <name>opendaylight-mirror</name>\r
+          <url>https://nexus.opendaylight.org/content/repositories/public/</url>\r
+          <releases>\r
+            <enabled>true</enabled>\r
+            <updatePolicy>never</updatePolicy>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>false</enabled>\r
+          </snapshots>\r
+        </repository>\r
+      </repositories>\r
+      <pluginRepositories>\r
+        <pluginRepository>\r
+          <id>opendaylight-mirror</id>\r
+          <name>opendaylight-mirror</name>\r
+          <url>https://nexus.opendaylight.org/content/repositories/public/</url>\r
+          <releases>\r
+            <enabled>true</enabled>\r
+            <updatePolicy>never</updatePolicy>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>false</enabled>\r
+          </snapshots>\r
+        </pluginRepository>\r
+      </pluginRepositories>\r
+    </profile>\r
+\r
+    <profile>\r
+      <id>opendaylight-snapshots</id>\r
+      <repositories>\r
+        <repository>\r
+          <id>opendaylight-snapshot</id>\r
+          <name>opendaylight-snapshot</name>\r
+          <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>\r
+          <releases>\r
+            <enabled>false</enabled>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>true</enabled>\r
+          </snapshots>\r
+        </repository>\r
+      </repositories>\r
+      <pluginRepositories>\r
+        <pluginRepository>\r
+          <id>opendaylight-snapshot</id>\r
+          <name>opendaylight-snapshot</name>\r
+          <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>\r
+          <releases>\r
+            <enabled>false</enabled>\r
+          </releases>\r
+          <snapshots>\r
+            <enabled>true</enabled>\r
+          </snapshots>\r
+        </pluginRepository>\r
+      </pluginRepositories>\r
+    </profile>\r
+\r
+    <profile>\r
+      <id>default</id>\r
+      <repositories>\r
+        <repository>\r
+          <id>default</id>\r
+          <name>default</name>\r
+          <url>https://repo.maven.org/maven2/</url>\r
+        </repository>\r
+      </repositories>\r
+    </profile>\r
+\r
+  </profiles>\r
+\r
+  <activeProfiles>\r
+    <activeProfile>default</activeProfile>\r
+    <activeProfile>openecomp-staging</activeProfile>\r
+    <activeProfile>openecomp-public</activeProfile>\r
+    <activeProfile>openecomp-release</activeProfile>\r
+    <activeProfile>openecomp-snapshots</activeProfile>\r
+    <activeProfile>opendaylight-release</activeProfile>\r
+    <activeProfile>opendaylight-snapshots</activeProfile>\r
+  </activeProfiles>\r
+</settings>\r