From d69d9836397941cba2b4114e3f81c338156e1277 Mon Sep 17 00:00:00 2001
From: Niranjana <niranjana.y60@wipro.com>
Date: Mon, 12 Apr 2021 13:59:26 +0000
Subject: [PATCH] Add new fields to config file in slice-analysis and remove
 unused files

Issue-ID: DCAEGEN2-2623
Signed-off-by: Niranjana <niranjana.y60@wipro.com>
Change-Id: Id869f721efe7a5a658b77ff78b18efe0e4751f22
(cherry picked from commit a894fb23cb8555aa3ee49191eabe922b496ef9f4)
---
 .../testsuites/config/sliceanalysisms/config_all.json    |   3 +++
 .../testsuites/config/sliceanalysisms/trust.jks          | Bin 1413 -> 0 bytes
 .../testsuites/config/sliceanalysisms/trust.pass         |   1 -
 .../testsuites/docker-compose.yaml                       |   3 ---
 .../testcases/data/expected_ml_response.json             |   1 -
 .../testcases/data/expected_pm.json                      |   1 -
 .../testcases/data/expected_pm1.json                     |   1 -
 .../testcases/data/expected_pm2.json                     |   1 -
 .../testcases/data/expected_pm3.json                     |   1 -
 9 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks
 delete mode 100644 plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass
 delete mode 100644 tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_ml_response.json
 delete mode 100644 tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm.json
 delete mode 100644 tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm1.json
 delete mode 100644 tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm2.json
 delete mode 100644 tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm3.json

diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json
index b084b57d..75938019 100644
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json
+++ b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json
@@ -64,6 +64,9 @@
     "sliceanalysisms.pollingTimeout": 60,
     "sliceanalysisms.cid": "sliceanalysisms-cid",
     "sliceanalysisms.configDb.service": "http://configdb_sim:5000",
+    "sliceanalysisms.aai.url": "http://configdb_sim:5000/aai/v21",
+    "sliceanalysisms.cps.url": "http://configdb_sim:5000",
+    "sliceanalysisms.configDbEnabled": "true",
     "service_calls": {
       "policy-req": []
     },
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.jks
deleted file mode 100644
index 33d9c569a19cae5e9dff651546af0e32c75c02cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1413
zcmb7DYdF&j9NtyOZA)s_5F%&oQ2$x0DH;<wMo2TEScO$0b>#kxoi_K}aw~J~5LPVa
zlIxaon>BgT$%FBzC*`=8q?*Hd&WApnFXzMWd7t<Fz0dFYeRyBRtYQ`f0zozg{12*}
zXZQpLpJxR602@+h0vk^P!9Dg70do)tP662PqW~LfTnvSPArNIy;ltU^3aO9>s4FSs
zxc1!7>R_-c90Zu)5rCQ!lm=5(gFCxfTifB)0o6^eq6Tw5VeNuf1(Y|bk|u=a2JF&O
z$CH2q01<xxPc$QWYN-=Q0D*x2m;TRdY{>2(-vPrxP&Nb!0@x502pa+hb()vkYt+>-
z&_TPNWHKM?<Xy5yyBT<DpAmjtjjpWcHQLiCipW(f(#xb4Z)V{v3Tjp3ln1sQSDDkC
z%bi#4O~77UHQ~*P9C_`{&CC#uQFq6II3v#q7V&4jXOw43?6T1AiEnTB>NJ?bl(%L;
z#6E-m7bs`3lE&P&_@~o;X>uH;z%SdxLzeQ#;e#`L!&aoDcQY?eD<jRhhL4>&$ZzM4
zDkG0D6GBUU*RnpO!CC|KQ%1_N3!;cNJ`3IbYC2Wev+W{OcZX}zt(bLp?ATOB@KVzw
z+nXm6+$-9Ikty+_%yp!naN@Pgupn8#;)zwO#9?hu^woKGR)n=7<CbNPcw3b-?Vz@)
z<C;Lyd3(<S<@aSZu7`-*7@;@e+dz!{UaH|LwY`5Rux_McnEu8Y>hCy2Bu%$3y;&${
z=YPhyhy#^mW02hKNu!?zdk1@SiGr93P5Ng<fs9Zcqk0!XH)5!FRpY8^gJ0J>43NBG
zZK%E!awv+SR;B)%AlnLkk!3kDZ%p?HDI6<KZELXe)B>bgrOSr|xL&H`mbEhh(y&M-
zO)lL3Y%<%PR@5J3d9Lo}gEGV63nqZrTll;$(dOG^QlV4a?L`}eadImlPyf?Wwv~j#
zq<*YH9p+~vM=jAE_^l6zIv5e|Ut*Ns4R{6IJEZ}Ef<fT2^8f?T-H4zr0)~QZccT%O
zs53HGfhhcr2#b%J|1kS2ptrd;grNac?0*}On+8oVcpU}@pc?=nHU;FS0NW@C_s1A+
zv|=NMU=UfahglO|<Wx(>1TZYxO;7f8Z@Hwft0j&n1Q`<cOPBM8pm||RSJpIC$cRks
z;y4zy+ee&<p(kC=6J&8H`@C{G=GGL(1}*wQ%(gjlfy>qBLuO0YKGt-V%=YuBV*lJv
z4}tXj2+0o85ii|utShHQ#+|(HIWO+RibJlC@4OzKa<|}tEu-wKL!YF!)7!SPq|i$<
ztA9^*?0YM5mzlgS<SM7WrHQ2fG+CZz#ChYAszDAfE-GJ=z6_6=zTA_Bu71T&;)MyH
z?21e@ra9C!w^5Hvf(^inJq>n4xd?e!;tKIG23GHQuPFW!92XsRWWX#MduAAk_&ByQ
z5xe6p$JBEi1{Z_{F^+b+Wu%*Pb2|9Qa-1TT#j$ob{$)|J8k)}EjtxrUoV_xCj*XG0
z=&j$cs6-K-s$!S1V?naa^7TNLIYy8{NY(BOYqG%V|5ciQTvJHcKjkm?C0iUTzgKBM
z*BopQpuA-kgDY42rbfsOoqNAXsl~57a!!`;W=@QObRU!~-0*FjMl;zugTsgE^E|7N
z{FPHNvdL?YDxAEHWQn_5?yMs3cJn94baH0Qe#)q)1RhhkkelvwpbWZhj$d~5I~~BW
zl1`CX-_NDcEw+6^M=Pj&seog6GQEr_)_FV{bp!bxwKMu1Z~n!ri#l4N+?j%$Yb(jl
Si{&<vIBdM7=c&k}jK2YAkYQv1

diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass
deleted file mode 100644
index 86edc20c..00000000
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/trust.pass
+++ /dev/null
@@ -1 +0,0 @@
-YPHcOFZP}sptD;*RV8N!46rG
\ No newline at end of file
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/docker-compose.yaml b/plans/dcaegen2-services-slice-analysis-ms/testsuites/docker-compose.yaml
index cac148c3..e593b4d2 100644
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/docker-compose.yaml
+++ b/plans/dcaegen2-services-slice-analysis-ms/testsuites/docker-compose.yaml
@@ -87,9 +87,6 @@ services:
      - "8080:8080"
     volumes:
      - ./config/sliceanalysisms/config_all.json:/etc/config_all.json
-     - ./config/sliceanalysisms/trust12.jks:/opt/app/sliceanalysisms/etc/cert/trust.jks
-     - ./config/sliceanalysisms/trust.pass:/opt/app/sliceanalysisms/etc/cert/trust.pass
-    # - ./config/sliceanalysisms/trust.jks:/opt/app/sliceanalysisms/etc/cert/trustjss.jks
     depends_on:
      - postgres
     networks:
diff --git a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_ml_response.json b/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_ml_response.json
deleted file mode 100644
index 576fc891..00000000
--- a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_ml_response.json
+++ /dev/null
@@ -1 +0,0 @@
-{"closedLoopControlName":"ControlLoop-Slicing-116d7b00-dbeb-4d03-8719-d0a658fa735b","closedLoopAlarmStart":1604468227374,"closedLoopEventClient":"microservice.sliceAnalysisMS","closedLoopEventStatus":"ONSET","requestID":"0196f8a4-117b-4e51-b013-92e0b7ad95a8","target":"vserver.vserver-name","payload":{"name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","serviceInstanceID":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","globalSubscriberId":"Customer-001","subscriptionServiceType":"Premium","networkType":"AN","additionalProperties":{"modifyAction":"reconfigure","snssaiList":["001-00110"],"sliceProfileId":"878f32c0-3699-4dbd-95a3-1f01d6c763fd","resourceConfig":{"snssai":"001-00110","data":[{"gNBCUName":"cucpserver1","nearRTRICId":"11","cellCUList":[{"cellLocalId":103593989,"configData":{"maxNumberofConns":"20","predictedMaxNumberofConns":"25","lastUpdatedTS":"yyyy/MM/dd HH:mm:ss"}}]}]},"nsiInfo":{"nsiName":"","nsiId":"2d43ff64-76bd-437b-ab98-1e7aa3e5df5f"},"scriptName":"AN"}},"from":"DCAE","version":"1.0.2","target_type":"VNF","AAI":{"vserver.is-closed-loop-disabled":"false","vserver.prov-status":"ACTIVE","vserver.vserver-name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82"}}
diff --git a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm.json b/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm.json
deleted file mode 100644
index a1b49165..00000000
--- a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm.json
+++ /dev/null
@@ -1 +0,0 @@
-{"closedLoopControlName":"ControlLoop-Slicing-116d7b00-dbeb-4d03-8719-d0a658fa735b","closedLoopAlarmStart":1608198244852,"closedLoopEventClient":"microservice.sliceAnalysisMS","closedLoopEventStatus":"ONSET","requestID":"4fae9c22-59f1-47e8-a8a2-c4cbb79418cc","target":"vserver.vserver-name","payload":{"name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","serviceInstanceID":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","globalSubscriberId":"Customer-001","subscriptionServiceType":"Premium","networkType":"AN","additionalProperties":{"modifyAction":"reconfigure","snssaiList":["001-010000"],"sliceProfileId":"878f32c0-3699-4dbd-95a3-1f01d6c763fd","resourceConfig":{"11":{"dLThptPerSlice":29,"uLThptPerSlice":32},"22":{"dLThptPerSlice":25,"uLThptPerSlice":28}},"nsiInfo":{"nsiName":"","nsiId":"f61681df-cbbe-4851-9ab6-fab24c8c77b4"},"scriptName":"AN"}},"from":"DCAE","version":"1.0.2","target_type":"VNF","AAI":{"vserver.is-closed-loop-disabled":"false","vserver.prov-status":"ACTIVE","vserver.vserver-name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82"}}
diff --git a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm1.json b/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm1.json
deleted file mode 100644
index bd4ca924..00000000
--- a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"closedLoopControlName":"ControlLoop-Slicing-116d7b00-dbeb-4d03-8719-d0a658fa735b","closedLoopAlarmStart":1604494201291,"closedLoopEventClient":"microservice.sliceAnalysisMS","closedLoopEventStatus":"ONSET","requestID":"0afb48b6-db08-45d6-aff3-675255f51ed5","target":"vserver.vserver-name","payload":{"name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","serviceInstanceID":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","globalSubscriberId":"Customer-001","subscriptionServiceType":"Premium","networkType":"AN","additionalProperties":{"modifyAction":"reconfigure","snssaiList":["001-00110"],"sliceProfileId":"878f32c0-3699-4dbd-95a3-1f01d6c763fd","resourceConfig":{"11":{"dLThptPerSlice":50,"uLThptPerSlice":40}},"nsiInfo":{"nsiName":"","nsiId":"a7f1242d-5889-46c3-bb0a-800c6ae388d1"},"scriptName":"AN"}},"from":"DCAE","version":"1.0.2","target_type":"VNF","AAI":{"vserver.is-closed-loop-disabled":"false","vserver.prov-status":"ACTIVE","vserver.vserver-name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82"}}
diff --git a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm2.json b/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm2.json
deleted file mode 100644
index bd4ca924..00000000
--- a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"closedLoopControlName":"ControlLoop-Slicing-116d7b00-dbeb-4d03-8719-d0a658fa735b","closedLoopAlarmStart":1604494201291,"closedLoopEventClient":"microservice.sliceAnalysisMS","closedLoopEventStatus":"ONSET","requestID":"0afb48b6-db08-45d6-aff3-675255f51ed5","target":"vserver.vserver-name","payload":{"name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","serviceInstanceID":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82","globalSubscriberId":"Customer-001","subscriptionServiceType":"Premium","networkType":"AN","additionalProperties":{"modifyAction":"reconfigure","snssaiList":["001-00110"],"sliceProfileId":"878f32c0-3699-4dbd-95a3-1f01d6c763fd","resourceConfig":{"11":{"dLThptPerSlice":50,"uLThptPerSlice":40}},"nsiInfo":{"nsiName":"","nsiId":"a7f1242d-5889-46c3-bb0a-800c6ae388d1"},"scriptName":"AN"}},"from":"DCAE","version":"1.0.2","target_type":"VNF","AAI":{"vserver.is-closed-loop-disabled":"false","vserver.prov-status":"ACTIVE","vserver.vserver-name":"3f2f23fa-c567-4dd8-8f15-f95ae3e6fd82"}}
diff --git a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm3.json b/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm3.json
deleted file mode 100644
index 8b137891..00000000
--- a/tests/dcaegen2-services-slice-analysis-ms/testcases/data/expected_pm3.json
+++ /dev/null
@@ -1 +0,0 @@
-
-- 
2.16.6