Merge "Remove certOnly and basicAuth from authentication methods CSIT VES"

diff --git a/INFO.yaml b/INFO.yaml
index 70c224f..de20963 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -3,11 +3,11 @@ project: 'integration-csit'
 project_creation_date: '2017-02-10'
 lifecycle_state: 'Incubation'
 project_lead: &onap_releng_ptl
-    name: 'Yang Xu'
-    email: 'yang.xu3@huawei.com'
-    id: 'xuyang11'
-    company: 'Huawei'
-    timezone: 'America/New York'
+    name: 'Morgan Richomme'
+    email: 'morgan.richomme@orange.com'
+    id: 'mrichomme'
+    company: 'Orange'
+    timezone: 'France/Paris'
 primary_contact: *onap_releng_ptl
 issue_tracking:
     type: 'jira'
@@ -15,123 +15,59 @@ issue_tracking:
     key: 'INT'
 meetings:
     - type: 'zoom'
-        agenda: 'https://wiki.onap.org/display/DW/Integration+Meeting+Minutes'
-        url: 'https://wiki.onap.org/pages/viewpage.action?pageId=6593670'
-        server: 'n/a'
-        channel: 'n/a'
-        repeats: 'weekly'
-        time: '14:00 UTC'
+      agenda: 'https://wiki.onap.org/display/DW/Integration+Meeting+Minutes'
+      url: 'https://wiki.onap.org/pages/viewpage.action?pageId=6593670'
+      server: 'n/a'
+      channel: 'n/a'
+      repeats: 'weekly'
+      time: '14:00 UTC'
+repositories:
+    - 'csit'
 committers:
     - <<: *onap_releng_ptl
     - name: 'Christophe Closset'
-        email: 'cc697w@intl.att.com'
-        company: 'ATT'
-        id: 'ChrisC'
-        timezone: 'Belgium/Namur'
-    - name: 'Dmitriy Andrushko'
-        email: 'dandrushko@mirantis.com'
-        company: 'Mirantis'
-        id: 'Dmitriy Andrushko'
-        timezone: 'Ukraine/Kharkiv'
+      email: 'cc697w@intl.att.com'
+      company: 'ATT'
+      id: 'ChrisC'
+      timezone: 'Belgium/Namur'
     - name: 'Daniel Rose'
-        email: 'DR695H@att.com'
-        company: 'ATT'
-        id: 'DR695H'
-        timezone: 'America/New York'
-    - name: 'yuanxing feng'
-        email: 'feng.yuanxing@zte.com.cn'
-        company: 'ZTE'
-        id: 'fengyuanxing'
-        timezone: 'China'
+      email: 'DR695H@att.com'
+      company: 'ATT'
+      id: 'DR695H'
+      timezone: 'America/New York'
     - name: 'Fu Jinhua'
-        email: 'fu.jinhua@zte.com.cn'
-        company: 'ZTE'
-        id: 'fujinhua'
-        timezone: 'China'
-    - name: 'Gil Hellmann'
-        email: 'gil.hellmann@windriver.com'
-        company: 'Windriver'
-        id: 'ghellman'
-        timezone: 'America'
-    - name: 'Gary Wu'
-        email: 'gary.i.wu@huawei.com'
-        company: 'Huawei'
-        id: 'gwu'
-        timezone: 'America/Santa Clara'
-    - name: 'Hector Anapan-Lavalle'
-        email: 'ha076r@att.com'
-        company: 'ATT'
-        id: 'ha076r'
-        timezone: 'America/New York'
-    - name: 'Helen Chen'
-        email: 'helen.chen@huawei.com'
-        company: 'Huawei'
-        id: 'helenc878'
-        timezone: 'America/Santa Clara'
-    - name: 'He Rui'
-        email: 'herui14@huawei.com'
-        company: 'Huawei'
-        id: 'Horry'
-        timezone: 'China/Shenzhen'
+      email: 'fu.jinhua@zte.com.cn'
+      company: 'ZTE'
+      id: 'fujinhua'
+      timezone: 'China'
     - name: 'Catherine Lefevre'
-        email: 'cl664y@att.com'
-        company: 'AT&T'
-        id: 'Katel34'
-        timezone: 'Belgium'
-    - name: 'Anaël Closson'
-        email: 'ac2550@intl.att.com'
-        company: 'ATT'
-        id: 'nabero'
-        timezone: 'Belgium/Namur'
+      email: 'cl664y@att.com'
+      company: 'AT&T'
+      id: 'Katel34'
+      timezone: 'Belgium'
     - name: 'Marco Platania'
-        email: 'platania@research.att.com'
-        company: 'ATT'
-        id: 'platania'
-        timezone: 'America/New York'
-    - name: 'Ran Pollak'
-        email: 'Ran.Pollak@amdocs.com'
-        company: 'Amdocs'
-        id: 'Ranpollak'
-        timezone: 'Israel'
-    - name: 'Steve Smokowski'
-        email: 'ss835w@att.com'
-        company: 'AT&T'
-        id: 'SteveSmokowski'
-        timezone: 'America/New York'
-    - name: 'Tracy Van Brakle'
-        email: 'tv8394@att.com'
-        company: 'ATT'
-        id: 'tlvb0614'
-        timezone: 'America/New York'
-    - name: 'Stephen Gooch'
-        email: 'stephen.gooch@windriver.com'
-        company: 'Windriver'
-        id: 'wrs_sgooch'
-        timezone: 'America/Atlanta'
-    - name: 'xinhui li'
-        email: 'lxinhui@vmware.com'
-        company: 'Vmware'
-        id: 'xinhuili'
-        timezone: 'America/Santa Clara'
-    - name: 'Yang Xu'
-        email: 'yang.xu3@huawei.com'
-        company: 'Huawei'
-        id: 'xuyang11'
-        timezone: 'America/New York'
-    - name: 'yunlong ying'
-        email: 'ying.yunlong@zte.com.cn'
-        company: 'ZTE'
-        id: 'ying.yunlong'
-        timezone: 'China'
+      email: 'platania@research.att.com'
+      company: 'ATT'
+      id: 'platania'
+      timezone: 'America/New York'
     - name: 'Brian Freeman'
-        email: 'bf1936@att.com'
-        company: 'AT&T'
-        id: 'bdfreeman1421'
-        timezone: 'America/New York'
+      email: 'bf1936@att.com'
+      company: 'AT&T'
+      id: 'bdfreeman1421'
+      timezone: 'America/New York'
     - name: 'Mariusz Wagner'
-        email: 'mariusz.wagner@nokia.com'
-        company: 'Nokia'
-        id: 'mwagner9'
-        timezone: 'Poland/Wroclaw'
+      email: 'mariusz.wagner@nokia.com'
+      company: 'Nokia'
+      id: 'mwagner9'
+      timezone: 'Poland/Wroclaw'
+    - name: 'Morgan Richomme'
+      email: 'morgan.richomme@orange.com'
+      company: 'orange'
+      id: 'mrichomme'
+      timezone: 'France/Paris'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
+    changes:
+        - type: 'Addition'
+          name: 'Morgan Richomme'
+          link: 'https://wiki.onap.org/display/DW/TSC+2019-10-17'

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index 4b184d3..6f5f2ee 100644 (file)
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -109,6 +109,7 @@ services:
       - HOSTNAME=${HV_VES_HOSTNAME}
       - CONSUL_HOST
       - CONFIG_BINDING_SERVICE
+      - CONFIG_BINDING_SERVICE_SERVICE_PORT
     healthcheck:
       interval: 10s
       timeout: 5s
@@ -133,6 +134,7 @@ services:
       - HOSTNAME=${HV_VES_HOSTNAME}
       - CONSUL_HOST
       - CONFIG_BINDING_SERVICE
+      - CONFIG_BINDING_SERVICE_SERVICE_PORT
     healthcheck:
       interval: 10s
       timeout: 5s

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
index 940c757..e3e253b 100755 (executable)
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
@@ -23,6 +23,7 @@ export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/tests/dcaegen2-collectors-hv-v
 export JAVA_OPTS="-Dio.netty.leakDetection.level=paranoid"
 export CONSUL_HOST="consul-server"
 export CONFIG_BINDING_SERVICE="config-binding-service"
+export CONFIG_BINDING_SERVICE_SERVICE_PORT="10000"
 
 export ONAP_NEXUS_REGISTRY="nexus3.onap.org:10001"
 export DOCKER_REGISTRY=${ONAP_NEXUS_REGISTRY}

diff --git a/plans/usecases/5G-bulkpm/README.txt b/plans/usecases/5G-bulkpm/README.txt
index 1d0fc41..5bc82a2 100644 (file)
--- a/plans/usecases/5G-bulkpm/README.txt
+++ b/plans/usecases/5G-bulkpm/README.txt
@@ -2,7 +2,7 @@
 By executing the below commands it will change the CSIT test from executing on a docker envirnoment to an ONAP one.
 ###################################################################################################################
 
-1) Login to an ONAP instance,switch user and verify that the command kubectl executes before proceeding .
+1) Login to an ONAP instance, switch user and verify that the command kubectl executes before proceeding .
 # sudo -s
 # kubectl get svc -n onap| grep dcae
 
@@ -15,7 +15,7 @@ By executing the below commands it will change the CSIT test from executing on a
 # sudo chmod +x /usr/local/bin/docker-compose
 # docker-compose --version    
 
-4)  Install the packages required for the RobotFramework.              
+4) Install the packages required for the RobotFramework.               
 # apt install python-pip
 # sudo apt install python-pip virtualenv unzip sshuttle netcat libffi-dev libssl-dev
 # sudo pip install robotframework
@@ -26,7 +26,7 @@ By executing the below commands it will change the CSIT test from executing on a
 # kubectl expose svc dcae-ves-collector --type=LoadBalancer --name=vesc -n onap
        service "vesc" exposed
 
-6) Verify the Ves-collector is expose
+6) Verify the Ves-collector is exposed
 # kubectl get svc -n onap | grep vesc
        vesc    LoadBalancer   10.43.203.47    10.209.63.55     8080:31835/TCP          1m
 
@@ -40,8 +40,8 @@ CSIT=FALSE
 8) Excute the Bulk PM e2e csit.
 # ./run-csit.sh plans/usecases/5G-bulkpm/
 
-
---> Trobleshooting 
+--> Troubleshooting
+--------------------
 If the Test case "Verify Default Feed And File Consumer Subscription On Datarouter" is hanging, quit the test and execute the below
 Get the DR-PROV IP address  
 # kubectl -n onap -o=wide get pods | grep dmaap-dr-prov | awk '{print $6}'
@@ -49,7 +49,7 @@ Get the DR-PROV IP address
 Make sure there are no feeds
 # curl -k https://10.42.123.76:8443/internal/prov
 
-If there is feeds delete them
+If there are feeds delete them
 curl -X DELETE -H "Content-Type:application/vnd.att-dr.subscription" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" -k https://10.42.123.76:8443/subs/XX
 
 Where XX is the number of the feeds in the previous command.

diff --git a/tests/policy/apex-pdp/data/pdp_update.json b/tests/policy/apex-pdp/data/pdp_update.json
index 95dbf13..ee48599 100644 (file)
--- a/tests/policy/apex-pdp/data/pdp_update.json
+++ b/tests/policy/apex-pdp/data/pdp_update.json
@@ -56,10 +56,6 @@
                             "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
                             "version": "1.0.0"
                         },
-                        {
-                            "name": "onap.Monitoring",
-                            "version": "1.0.0"
-                        },
                         {
                             "name": "onap.policies.monitoring.cdap.tca.hi.lo.app",
                             "version": "1.0.0"
@@ -114,4 +110,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}