From c863c9f002443dc37464a538107055928d5666b7 Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Tue, 3 Jan 2023 13:43:35 +0100 Subject: [PATCH] Uplift from ONAP Bugfix, locking of new RICs Improved synch, only deleting A1 policies that must be deleted. Signed-off-by: PatrikBuhr Issue-ID: NONRTRIC-743 Change-Id: I9b6df858fa56bfa1535e5c25f70e9339736c2e42 --- config/README | 6 ++++-- config/application.yaml | 13 +++++++++++-- config/keystore.jks | Bin 4779 -> 5269 bytes config/truststore.jks | Bin 3587 -> 3869 bytes onap/oran | 2 +- pom.xml | 10 ++++++++++ 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/config/README b/config/README index b54a675..42e0b7b 100644 --- a/config/README +++ b/config/README @@ -3,13 +3,15 @@ The keystore.jks and truststore.jks files are created by using the following com 1) Create a CA certificate and a private key: openssl genrsa -des3 -out CA-key.pem 2048 -openssl req -new -key CA-key.pem -x509 -days 1000 -out CA-cert.pem +openssl req -new -key CA-key.pem -x509 -days 3600 -out CA-cert.pem 2) Create a keystore with a private key entry that is signed by the CA: +Note: the "your name" must be "localhost" for the unittest to work. + keytool -genkeypair -alias policy_agent -keyalg RSA -keysize 2048 -keystore keystore.jks -validity 3650 -storepass policy_agent keytool -certreq -alias policy_agent -file request.csr -keystore keystore.jks -ext san=dns:your.domain.com -storepass policy_agent -openssl x509 -req -days 365 -in request.csr -CA CA-cert.pem -CAkey CA-key.pem -CAcreateserial -out ca_signed-cert.pem +openssl x509 -req -days 3650 -in request.csr -CA CA-cert.pem -CAkey CA-key.pem -CAcreateserial -out ca_signed-cert.pem keytool -importcert -alias ca_cert -file CA-cert.pem -keystore keystore.jks -trustcacerts -storepass policy_agent keytool -importcert -alias policy_agent -file ca_signed-cert.pem -keystore keystore.jks -trustcacerts -storepass policy_agent diff --git a/config/application.yaml b/config/application.yaml index f0f5337..2bd8d83 100644 --- a/config/application.yaml +++ b/config/application.yaml @@ -41,8 +41,11 @@ logging: org.springframework: ERROR org.springframework.data: ERROR org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR + org.springframework.web.servlet.DispatcherServlet: INFO org.onap.ccsdk.oran.a1policymanagementservice: INFO - # org.onap.ccsdk.oran.a1policymanagementservice.tasks: TRACE + pattern: + console: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{20} - %msg%n" + file: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] %logger{20} - %msg%n" file: name: /var/log/policy-agent/application.log server: @@ -74,7 +77,7 @@ app: http.proxy-host: http.proxy-port: 0 http.proxy-type: HTTP - # path where the service can store data + # path where the service can store data. This parameter is not relevant if S3 Object store is configured. vardata-directory: /var/policy-management-service # the config-file-schema-path referres to a location in the jar file. If this property is empty or missing, # no schema validation will be executed. @@ -82,3 +85,9 @@ app: # A file containing an authorization token, which shall be inserted in each HTTP header (authorization). # If the file name is empty, no authorization token is sent. auth-token-file: + # S3 object store usage is enabled by defining the bucket to use. This will override the vardata-directory parameter. + s3: + endpointOverride: http://localhost:9000 + accessKeyId: minio + secretAccessKey: miniostorage + bucket: diff --git a/config/keystore.jks b/config/keystore.jks index 48c3b33c0dfb61f1679df3f0f3b3503321bbd21c..563c67b309780ca80622b2360e627b72887970ee 100644 GIT binary patch literal 5269 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 Jg$;}=`yXAMCD8x? delta 3565 zcmY+EXD}R$+J>=3@1lg&d&%k&t8BCoHQMUE_udxEs?pMjD2XM6Wr-G63lZHSI*GFp zJ;bZm1Yf?HbLPzX@ytDQ-E%)buh-m3TqtQY?F|_z;BVl;l;Wwnsb{pLUzlI= z>U!_UY((aV_9@^vMbqAc3_ybVYyw0BhgzqD+2Ahh^xO$lJgrR+RS8`3js}O6}?1=sdr&2v^dXc<;HO0I@ha5{`NvcK=w}<7FVen3rz+RH`NrX zE)n+0V;?^t8-i)|z|;%OKuw;8pKG(I{*B;KvD}&(G<>d@i>lX|kUUCxVidVJLpzld z=hEfYBo$!edtpPI(#84(1FNsypJ`Q5RL+n&CzBTU&d_cfq5K`T#{8Q#RaPFUWUlC z4)Ef2 z)khtcy5gp6DWeB)^aT^g2U~(}a|v!oE3>bBYS~q*LN(tB+r3P!pZnU}>sZcr37n?5 zt-CnU9-a4GEIN*zx4D};L0+LUkG>RE?!B6eIUS=W4EBr)P6MrH`LNA$_iE2Q4|kYa z*h0Fr11vO~UET?&cT=tVWSZ^Z2NUMR8xE5eCKt9jOJL9HA8;!?*O_1*?xJK2#X>3a zO2nVZp@4BPuP?Tjn-RPnRBI0)Q-NCjdhbgZqkMJ`boa9*Jz_d7q$ZMytEo!F3{=4cPJCGsFheSkO%9A+KcPGm#2kRT*1OT~&4JVLS0%KddJKNlts(iMwcJiBSG#2dFA!2=w}gjQ zk_=yW*sDIsYp9`{R_Vhi4v_b&9T`&(r_H=(6VXj_j$yoMOn!G^P%Zq2V?A~pJ5HLV zE*pe@QSBwrZ5pDd&SDbWBB{1dBCi}O=z~lTCe)76gaVmtbj#N46@Qc4ZJcWsYByD( z)McV+t)AA!j>D=%zU564unwNfuyO^Yq$o6IH=h1S#t;vG1ql)O&39%^c>HXj^|Qdt zvA^zBd>g#XP-s2en1(PMcPrxRH7|@gk-=q5|IcLj7qA*_cCf6(R83rk!xEi|iNKrM z=+lwVx4XkfwHi<+1M~ee(B$Q+X-+vJ>nco%&ZegCkr3eX#Gs{@9=ndN*3~NO9X3gZ-}S`D@P4CJAWr1-kxJ!3ZVu#2(q#^2@8YPGsaRQ2&5F zvL;AVZliGDmsANEsV4`j_I|8*?Jo^a56g;Wy`aq!+~tdN12-Mm{ zrT3nn4!K2xyXUQPSeS7sVi#vIraPIkU$CLCi(-xnxa=t$l2mn3ssGbTg=!|HXAHvX zYWko_ZKLg;_D02Oz8owqj^&(2#0x*!M30=zc|(0tDE6`iJojt5>&>r77a7TlzQo&0 z)5ywG&pxAw98r9fnO0(wUHyA9WrTlui(NxHx)NfR?*q?vo)t?v zkDA?XrT#e6J{GTaU1bE8m;n(pPxQnlUG;ngg+l0|s7I4Jl0|B=vB%9T&#R+x)29H)VAl3Kg6PGs? z4YQ%od!V^xK!pR=kjv3)WG+B9{OQIus?N?GjuU^zW6)vAnwlv)i%lx($i-F8m)WTN zJcx(9V+>r$>e~`0OzuzVMnK9|U_mrQ+FAY7$|>ZW_p>g%Cx)8Tb;I6r;L@-0bOPX} zw&b!DZxF0wO>cD?mY43CCj;q6cdx`^=Emb!LDmXTF-5kcunf=ltFvb3k;bTEYoh}8 zDZKec8iC95m__YC> z;y{55vt z{rS<)uTLtHbtjnwW69g2H_W0~=$+z?r@dkJ)@UM^_X$_*>|N;`Mm3D4OQ-xb<5q)qMq$#4vrv4;!LyYvqh*z2MS_d$rG4CV>a?EqNV#?XWX1jg!Vr!oU$eeJ^=0nwi#n@N7x|CI7l!@V z);o&P`rV27zKGe5jMkmw7jDPx zH&l%3d-tX`^QlZpT6`C#YD=_Q#r=fK#DR@9-K`@tWMY8> zauGZR&ymS&47gA@fqr#hTR$gHh=wd=EKVYBh~AB*i`HLn72$}iR(v8OV*MCzDhtG( z#E87+Q7=OJP9>7Lms5fIpvH5KVn-#3lib<^bZlyS+lBC+{bDm-?w*~S`9a-WVho>N zXU>4Y(_q>Ux%(Q{+h;G`$fZ?n+2napL5UAN(jRvva(r+(&3LhWp3A2|{#AcYqpsDi zgj{t^?=)H5CC8U&JCK09c-z92NrSCxe=S1f<{t#;UP@P>)I@W0fyDTSvpz>qjD;Px;X{W z-nxJtDvruC&2L**_cY1@6CW^0t4Z@oQ-VPfbO5s3AQB*pM|uRgV~eYISk>0G@Htjh k8UMB&$Wo#_J1pjlDVi;oa8aVsnnH{Xwd9ZiNK-NY2XWJ?uK)l5 diff --git a/onap/oran b/onap/oran index ca31593..123ba96 160000 --- a/onap/oran +++ b/onap/oran @@ -1 +1 @@ -Subproject commit ca315932268e1c5da6a12201db4cfaef35df69bb +Subproject commit 123ba96ee12d73d89aac9e274ae9e3cffe7249ea diff --git a/pom.xml b/pom.xml index 9dc093b..9b87c81 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,7 @@ 3.7.0.1746 0.8.5 3.0.0 + 2.17.292 @@ -203,6 +204,15 @@ everit-json-schema 1.13.0 + + software.amazon.awssdk + s3 + ${software.amazon.awssdk.version} + + + io.micrometer + micrometer-registry-prometheus + -- 2.16.6