Merge "HV-VES heat template update"

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index b1f0da1..9680e75 100644 (file)
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -8,7 +8,7 @@ parameters:
   rancher_vm_flavor: m5.xlarge
   k8s_vm_flavor: m4.xlarge
   etcd_vm_flavor: m1.medium
-  orch_vm_flavor: m1.large
+  orch_vm_flavor: m1.medium
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
 

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index c768cd2..ce0f4fe 100644 (file)
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -8,7 +8,7 @@ parameters:
   rancher_vm_flavor: m2.xlarge
   k8s_vm_flavor: m1.xlarge
   etcd_vm_flavor: m1.medium
-  orch_vm_flavor: m1.large
+  orch_vm_flavor: m1.medium
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
 

diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 609af91..61ed8a5 100644 (file)
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -220,7 +220,6 @@ resources:
               get_attr: [k8s_9_floating_ip, floating_ip_address],
               get_attr: [k8s_10_floating_ip, floating_ip_address],
               get_attr: [k8s_11_floating_ip, floating_ip_address],
-              get_attr: [k8s_12_floating_ip, floating_ip_address],
             ]
             __k8s_private_ips__: [
               get_attr: [k8s_1_floating_ip, fixed_ip_address],
@@ -234,7 +233,6 @@ resources:
               get_attr: [k8s_9_floating_ip, fixed_ip_address],
               get_attr: [k8s_10_floating_ip, fixed_ip_address],
               get_attr: [k8s_11_floating_ip, fixed_ip_address],
-              get_attr: [k8s_12_floating_ip, fixed_ip_address],
             ]
   k8s_1_private_port:
     type: OS::Neutron::Port
@@ -643,43 +641,6 @@ resources:
           template:
             get_file: k8s_vm_entrypoint.sh
 
-  k8s_12_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_network }
-      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  k8s_12_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: k8s_12_private_port }
-
-  k8s_12_vm:
-    type: OS::Nova::Server
-    properties:
-      name:
-        list_join: ['-', [ { get_param: 'OS::stack_name' }, 'k8s', '12' ] ]
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: k8s_vm_flavor }
-      key_name: { get_param: key_name }
-      networks:
-      - port: { get_resource: k8s_12_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __docker_proxy__: { get_param: docker_proxy }
-            __apt_proxy__: { get_param: apt_proxy }
-            __docker_version__: { get_param: docker_version }
-            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
-            __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] }
-            __host_label__: 'compute'
-          template:
-            get_file: k8s_vm_entrypoint.sh
-
   etcd_1_private_port:
     type: OS::Neutron::Port
     properties:
@@ -914,7 +875,3 @@ outputs:
     description: The IP address of the k8s_11 instance
     value: { get_attr: [k8s_11_floating_ip, floating_ip_address] }
 
-  k8s_12_vm_ip:
-    description: The IP address of the k8s_12 instance
-    value: { get_attr: [k8s_12_floating_ip, floating_ip_address] }
-

diff --git a/test/mocks/pnfsimulator/README.md b/test/mocks/pnfsimulator/README.md
index e53d72f..24359ae 100644 (file)
--- a/test/mocks/pnfsimulator/README.md
+++ b/test/mocks/pnfsimulator/README.md
@@ -20,7 +20,9 @@ Proper config must contain *simulatorParams*, *commonEventHeaderParams* and *pnf
 The recommended way is to checkout PNF Simulator project from ONAP Git repository and use *simulator*.sh script.
 If you copy *simulator.sh* script to another location, keep in mind to copy also *docker-compose.yml* and directories: *config,json_schema and netconf*.
 In order to run simulator, invoke ./simulator.sh start
+You may be asked for providing password for ypur user during startup.
 Script downloads if necessary needed Docker images and runs instances of these images.
+The easiest way is to download or generate PNF Simulator zip archive with all needed configuration files.
 
 ###Logging
 It is possible to get access to logs by invocation of *./simulator.sh* logs. 

diff --git a/test/mocks/pnfsimulator/docker-compose.yml b/test/mocks/pnfsimulator/docker-compose.yml
index adaa3eb..d853ca9 100644 (file)
--- a/test/mocks/pnfsimulator/docker-compose.yml
+++ b/test/mocks/pnfsimulator/docker-compose.yml
@@ -27,7 +27,8 @@ services:
     restart: on-failure
     depends_on:
       - sftp-server
-      - ftpes-server
+      - ftpes-server-pure-ftpd
+      - ftpes-server-vsftpd
 
   sftp-server:
     container_name: sftp-server
@@ -40,8 +41,8 @@ services:
     restart: on-failure
     command: sftp-user::1001
 
-  ftpes-server:
-    container_name: ftpes-server
+  ftpes-server-pure-ftpd:
+    container_name: ftpes-server-pure-ftpd
     image: stilliard/pure-ftpd:latest
     ports:
       - "2221:21"
@@ -56,8 +57,8 @@ services:
       FTP_USER_HOME: onap
     restart: on-failure
 
-  vsftpd_ftpes_server:
-    container_name: vsftpd_ftpes_server
+  ftpes-server-vsftpd:
+    container_name: ftpes-server-vsftpd
     image: docker.io/panubo/vsftpd
     ports:
       - "8221:21"
@@ -76,3 +77,4 @@ services:
       - ./ftpes/files/onap/ftpes-onap.txt:/srv/ftpes-onap.txt:ro
     restart: on-failure
     command: vsftpd /etc/vsftpd_ssl.conf
+

diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml
index c8355dc..1f52bbd 100644 (file)
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -4,7 +4,6 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>

diff --git a/test/mocks/pnfsimulator/simulator.sh b/test/mocks/pnfsimulator/simulator.sh
index 23facce..6b61e6b 100755 (executable)
--- a/test/mocks/pnfsimulator/simulator.sh
+++ b/test/mocks/pnfsimulator/simulator.sh
@@ -46,7 +46,12 @@ function build_image(){
     fi
 }
 
+function set_vsftpd_file_owner() {
+    sudo chown root ./ftpes/vsftpd/configuration/vsftpd_ssl.conf
+}
+
 function start_netconf_server() {
+    set_vsftpd_file_owner
     docker-compose -f $1 up -d $NETOPEER_CONTAINER_NAME
     echo
     echo "NETCONF server container's logs:"
@@ -62,7 +67,7 @@ function start(){
         echo "Simulator containers are already up"
     else
         echo "Starting simulator containers using netconf model specified in config/netconf.env"
-
+        set_vsftpd_file_owner
         archive_logs
         start_netconf_server $1
         docker-compose -f $1 up -d $SIMULATOR_CONTAINER_NAME
@@ -138,7 +143,7 @@ Logs are written to logs/pnf-simulator.log. After each "start/start-dev" old log
 
 FOR DEVELOPERS
 1. Build local simulator image using "./simulator.sh build"
-2. Run containers with "./simulator.sh start-debug"
+2. Run containers with "./simulator.sh start-dev"
 
 If you change the source code you have to rebuild image with "./simulator.sh build" and run "./simulator.sh start/start-dev" again
 EndOfMessage

diff --git a/test/mocks/pnfsimulator/src/assembly/resources.xml b/test/mocks/pnfsimulator/src/assembly/resources.xml
index 4963fa7..063c710 100644 (file)
--- a/test/mocks/pnfsimulator/src/assembly/resources.xml
+++ b/test/mocks/pnfsimulator/src/assembly/resources.xml
@@ -39,6 +39,8 @@
             <includes>
                 <include>**/*</include>
             </includes>
+            <fileMode>0644</fileMode>
+
         </fileSet>
         <fileSet>
             <directory>json_schema</directory>
@@ -67,6 +69,7 @@
             <includes>
                 <include>**/*</include>
             </includes>
+
         </fileSet>
     </fileSets>
 </assembly>
\ No newline at end of file

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 4f6c10f..4beeecf 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -1,13 +1,14 @@
 image,tag
-onap/aaf/aaf_cass,2.1.5-SNAPSHOT
-onap/aaf/aaf_cm,2.1.5-SNAPSHOT
-onap/aaf/aaf_config,2.1.5-SNAPSHOT
-onap/aaf/aaf_fs,2.1.5-SNAPSHOT
-onap/aaf/aaf_gui,2.1.5-SNAPSHOT
-onap/aaf/aaf_hello,2.1.5-SNAPSHOT
-onap/aaf/aaf_locate,2.1.5-SNAPSHOT
-onap/aaf/aaf_oauth,2.1.5-SNAPSHOT
-onap/aaf/aaf_service,2.1.5-SNAPSHOT
+onap/aaf/aaf_agent,2.1.6-SNAPSHOT
+onap/aaf/aaf_cass,2.1.6-SNAPSHOT
+onap/aaf/aaf_cm,2.1.6-SNAPSHOT
+onap/aaf/aaf_config,2.1.6-SNAPSHOT
+onap/aaf/aaf_fs,2.1.6-SNAPSHOT
+onap/aaf/aaf_gui,2.1.6-SNAPSHOT
+onap/aaf/aaf_hello,2.1.6-SNAPSHOT
+onap/aaf/aaf_locate,2.1.6-SNAPSHOT
+onap/aaf/aaf_oauth,2.1.6-SNAPSHOT
+onap/aaf/aaf_service,2.1.6-SNAPSHOT
 onap/aaf/abrmd,3.0.0-SNAPSHOT-latest
 onap/aaf/distcenter,3.0.0-SNAPSHOT-latest
 onap/aaf/sms,3.0.0-SNAPSHOT-latest
@@ -19,8 +20,8 @@ onap/aai-traversal,1.3-STAGING-latest
 onap/aai/esr-gui,1.2.2-STAGING-latest
 onap/aai/esr-server,1.2.2-STAGING-latest
 onap/admportal-sdnc-image,1.4-STAGING-latest
-onap/appc-cdt-image,1.4.0-SNAPSHOT-latest
-onap/appc-image,1.4.0-SNAPSHOT-latest
+onap/appc-cdt-image,1.4.1-SNAPSHOT-latest
+onap/appc-image,1.4.1-SNAPSHOT-latest
 onap/babel,1.3-STAGING-latest
 onap/ccsdk-apps-ms-neng,latest
 onap/ccsdk-controllerblueprints,latest
@@ -41,8 +42,8 @@ onap/dmaap/kafka01101,0.0.1
 onap/externalapi/nbi,3.0.0-latest
 onap/fproxy,2.1-STAGING-latest
 onap/gizmo,1.3-STAGING-latest
-onap/holmes/engine-management,1.2.0-STAGING-latest
-onap/holmes/rule-management,1.2.0-STAGING-latest
+onap/holmes/engine-management,1.2.1-STAGING-latest
+onap/holmes/rule-management,1.2.1-STAGING-latest
 onap/model-loader,1.3-STAGING-latest
 onap/msb/msb_apigateway,1.2.2-STAGING-latest
 onap/msb/msb_discovery,1.2.2-STAGING-latest
@@ -70,7 +71,7 @@ onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
 onap/org.onap.dcaegen2.deployments.cm-container,1.4.2
 onap/org.onap.dcaegen2.deployments.healthcheck-container,1.1.2
-onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.4.4
+onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.4.5
 onap/org.onap.dcaegen2.deployments.redis-cluster-container,1.0.0
 onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1.0
 onap/org.onap.dcaegen2.deployments.tls-init-container,1.0.0
@@ -124,7 +125,7 @@ onap/sparky-be,1.3-STAGING-latest
 onap/spike,1.0-STAGING-latest
 onap/testsuite,1.3.1-STAGING-latest
 onap/tproxy-config,2.1-STAGING-latest
-onap/usecase-ui,1.2.0-STAGING-latest
+onap/usecase-ui,1.2.1-STAGING-latest
 onap/usecase-ui-server,1.2.0-STAGING-latest
 onap/validation,1.3-STAGING-latest
 onap/vfc/catalog,1.2.0-STAGING-latest

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 6b9f238..775e4fb 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -1,11 +1,13 @@
 image,tag
-onap/aaf/aaf_cm,2.1.5
-onap/aaf/aaf_fs,2.1.5
-onap/aaf/aaf_gui,2.1.5
-onap/aaf/aaf_hello,2.1.5
-onap/aaf/aaf_locate,2.1.5
-onap/aaf/aaf_oauth,2.1.5
-onap/aaf/aaf_service,2.1.5
+onap/aaf/aaf_agent,2.1.6
+onap/aaf/aaf_cm,2.1.6
+onap/aaf/aaf_config,2.1.6
+onap/aaf/aaf_fs,2.1.6
+onap/aaf/aaf_gui,2.1.6
+onap/aaf/aaf_hello,2.1.6
+onap/aaf/aaf_locate,2.1.6
+onap/aaf/aaf_oauth,2.1.6
+onap/aaf/aaf_service,2.1.6
 onap/aaf/abrmd,3.0.0
 onap/aaf/distcenter,3.0.0
 onap/aaf/sms,3.0.0
@@ -13,8 +15,8 @@ onap/aaf/smsquorumclient,3.0.0
 onap/aaf/testcaservice,3.0.0
 onap/aai-cacher,1.0.0
 onap/aai-graphadmin,1.0.0
-onap/aai-resources,1.3.0
-onap/aai-traversal,1.3.0
+onap/aai-resources,1.3.1
+onap/aai-traversal,1.3.1
 onap/aai/esr-gui,1.2.1
 onap/aai/esr-server,1.2.1
 onap/admportal-sdnc-image,1.3.4
@@ -39,8 +41,8 @@ onap/dmaap/dmaap-mr,1.1.7
 onap/dmaap/kafka01101,0.0.1
 onap/externalapi/nbi,3.0.1
 onap/gizmo,1.3.0
-onap/holmes/engine-management,1.2.0
-onap/holmes/rule-management,1.2.0
+onap/holmes/engine-management,1.2.1
+onap/holmes/rule-management,1.2.1
 onap/model-loader,1.3.0
 onap/msb/msb_apigateway,1.2.1
 onap/msb/msb_discovery,1.2.1
@@ -114,7 +116,7 @@ onap/so/sdnc-adapter,1.3.1
 onap/so/so-monitoring,1.3.1
 onap/so/vfc-adapter,1.3.1
 onap/sparky-be,1.3.0
-onap/usecase-ui,1.2.0
+onap/usecase-ui,1.2.1
 onap/usecase-ui-server,1.2.0
 onap/validation,1.3.0
 onap/vfc/catalog,1.2.0

diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index d76d907..0cda3e9 100644 (file)
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -1,28 +1,28 @@
 groupId,artifactId,version
-org.onap.aaf.authz,aaf-auth-batch,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-cass,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-certman,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-client,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-cmd,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-core,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-deforg,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-fs,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-gui,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-hello,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-locate,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-oauth,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-auth-service,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-cadi-aaf,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-cadi-cass,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-cadi-client,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-cadi-core,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-cadi-shiro,2.1.3-SNAPSHOT
-org.onap.aaf.authz,aaf-misc-env,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-misc-log4j,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-misc-rosetta,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-misc-xgen,2.1.5-SNAPSHOT
-org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.2-SNAPSHOT
+org.onap.aaf.authz,aaf-auth-batch,2.1.6
+org.onap.aaf.authz,aaf-auth-cass,2.1.6
+org.onap.aaf.authz,aaf-auth-certman,2.1.6
+org.onap.aaf.authz,aaf-auth-client,2.1.6
+org.onap.aaf.authz,aaf-auth-cmd,2.1.6
+org.onap.aaf.authz,aaf-auth-core,2.1.6
+org.onap.aaf.authz,aaf-auth-deforg,2.1.6
+org.onap.aaf.authz,aaf-auth-fs,2.1.6
+org.onap.aaf.authz,aaf-auth-gui,2.1.6
+org.onap.aaf.authz,aaf-auth-hello,2.1.6
+org.onap.aaf.authz,aaf-auth-locate,2.1.6
+org.onap.aaf.authz,aaf-auth-oauth,2.1.6
+org.onap.aaf.authz,aaf-auth-service,2.1.6
+org.onap.aaf.authz,aaf-cadi-aaf,2.1.6
+org.onap.aaf.authz,aaf-cadi-cass,2.1.6
+org.onap.aaf.authz,aaf-cadi-client,2.1.6
+org.onap.aaf.authz,aaf-cadi-core,2.1.6
+org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.6
+org.onap.aaf.authz,aaf-cadi-shiro,2.1.2
+org.onap.aaf.authz,aaf-misc-env,2.1.6
+org.onap.aaf.authz,aaf-misc-log4j,2.1.6
+org.onap.aaf.authz,aaf-misc-rosetta,2.1.6
+org.onap.aaf.authz,aaf-misc-xgen,2.1.6
+org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.2
 org.onap.aai,rest-client,1.3.0
 org.onap.aai,search-data-service,1.3.1
 org.onap.aai.aai-common,aai-annotations,1.3.0
@@ -54,13 +54,13 @@ org.onap.aai.logging-service,eelf-logging,1.3.0
 org.onap.aai.logging-service,logging-api,1.3.0
 org.onap.aai.logging-service,logging-service,1.3.0
 org.onap.aai.model-loader,model-loader,1.3.0
-org.onap.aai.resources,aai-resources,1.3.0
-org.onap.aai.resources,resources,1.3.0
+org.onap.aai.resources,aai-resources,1.3.1
+org.onap.aai.resources,resources,1.3.1
 org.onap.aai.router-core,router-core,1.3.0
 org.onap.aai.sparky-be,sparky-be,1.3.0
 org.onap.aai.sparky-fe,sparky-fe,1.3.0
-org.onap.aai.traversal,aai-traversal,1.3.0
-org.onap.aai.traversal,traversal,1.3.0
+org.onap.aai.traversal,aai-traversal,1.3.1
+org.onap.aai.traversal,traversal,1.3.1
 org.onap.aai.validation,validation,1.3.0
 org.onap.appc,appc-aai-client-provider,1.4.0
 org.onap.appc,appc-ansible-adapter-bundle,1.4.0