diff options
Diffstat (limited to 'kubernetes/pomba')
6 files changed, 18 insertions, 12 deletions
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties index aa80aed310..f07cb65c31 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties +++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -server.host={{ .Values.config.networkdiscoveryCtxBuilderHost }} +server.host={{ .Values.global.networkdiscoveryCtxBuilderHost }} basicauth.username={{ .Values.config.networkdiscoveryCtxBuilderUsername }} basicauth.password={{ .Values.config.networkdiscoveryCtxBuilderPassword }} server.port={{ .Values.config.ctxBuilderExternalPort }} diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml index 905ea87efa..9535a7ebd5 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml +++ b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml @@ -40,7 +40,6 @@ config: sdncCtxBuilderHost: pomba-sdncctxbuilder sdncCtxBuilderUsername: admin sdncCtxBuilderPassword: OBF:1u2a1toa1w8v1tok1u30 - networkdiscoveryCtxBuilderHost: pomba-networkdiscoveryctxbuilder networkdiscoveryCtxBuilderUsername: admin networkdiscoveryCtxBuilderPassword: OBF:1u2a1toa1w8v1tok1u30 ctxBuilderExternalPort: 9530 diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties index f84906e9ef..5317ab353c 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties @@ -31,6 +31,7 @@ server.tomcat.max-idle-time=60000 # Network Discovery Context Builder REST Service networkDiscoveryCtxBuilder.httpProtocol={{ .Values.config.networkDiscoveryCtxBuilderHttpProtocol }} +networkDiscoveryCtxBuilder.serviceName={{ .Values.global.networkdiscoveryCtxBuilderHost }} networkDiscoveryCtxBuilder.port={{ .Values.config.networkDiscoveryCtxBuilderPort }} # Basic Authorization credentials for Network Discovery Context Builder REST Service networkDiscoveryCtxBuilder.userId={{ .Values.config.networkDiscoveryCtxBuilderUserId }} diff --git a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties index 6606dc9936..bce6710a5e 100644 --- a/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-servicedecomposition/resources/config/application.properties @@ -34,7 +34,9 @@ basicAuth.password={{ .Values.config.serviceDecompositionPassword }} # AAI REST Client Configuration aai.serviceName=127.0.0.1 aai.servicePort=8443 -aai.httpProtocol=http +aai.username=AAI +aai.password=OBF:1gfr1ev31gg7 +aai.httpProtocol=https aai.securityProtocol=TLS aai.connectionTimeout=15000 aai.readTimeout=15000 diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy b/kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy index 3f91f8bf71..f74d832449 100644 --- a/kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy +++ b/kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy @@ -87,7 +87,7 @@ entity { rule { name 'SDC-AAI-vnfc-type' - category 'INVALID_VALUE' + category 'VNFC Consistency' description 'Validate that each VNFC instance in AAI conforms to a VNFC type defined in SDC model' errorText 'AAI VNFC instance includes non-specified type in design SDC model' severity 'ERROR' @@ -102,13 +102,13 @@ rule { def aaiTypes = getVnfcTypes(slurper.parseText(aaiList.toString())) // each type in AAI must exist in SDC - return aaiTypes.containsAll(sdcTypes) + return sdcTypes.containsAll(aaiTypes) ''' } rule { name 'SDC-AAI-vnfc-node-count' - category 'INVALID_VALUE' + category 'VNFC Consistency' description 'Validate that for each VNFC node defined in SDC model, there is at least one VNFC instance in AAI' errorText 'Design has specified types but not all of them exist in AAI' severity 'WARNING' @@ -132,7 +132,7 @@ rule { rule { name 'SDC-AAI-vf-module-instance-check' - category 'INVALID_VALUE' + category 'VF Consistency' description 'Validate that each VF module instance in AAI conforms to a VF module defined in SDC service model' errorText 'One or more AAI VF module instance(s) not defined in SDC model' severity 'CRITICAL' @@ -153,9 +153,9 @@ rule { rule { name 'NDCB-AAI-attribute-comparison' - category 'INVALID_VALUE' - description 'Verify that every attribute in Network-Discovery is the same as in AAI' - errorText 'Some attributes in Network-Discovery are not equal to attributes in AAI' + category 'Attribute Mismatch' + description 'Verify that all attributes in Network-Discovery are the same as in AAI' + errorText 'Error found with attribute "{0}"; value "{1}" does not exist in Network-Discovery' severity 'ERROR' attributes 'ndcbItems', 'aaiItems' validate ''' @@ -214,11 +214,14 @@ rule { java.util.Map aai = getAttributes(slurper.parseText(aaiItems.toString())) boolean result = true + List<String> details = new ArrayList<>(); ndcb.any{ ndcbKey, ndcbValueList -> def aaiValueList = aai.get("$ndcbKey") aaiValueList.each{ aaiValue -> if(!ndcbValueList.any{ it == "$aaiValue" }) { result = false + details.add("$ndcbKey") + details.add("$aaiValue") } } if(result == false) { @@ -226,6 +229,6 @@ rule { return true } } - return result + return new Tuple2(result, details) ''' -} +}
\ No newline at end of file diff --git a/kubernetes/pomba/values.yaml b/kubernetes/pomba/values.yaml index f0acaa5b88..04e89f07b3 100644 --- a/kubernetes/pomba/values.yaml +++ b/kubernetes/pomba/values.yaml @@ -22,6 +22,7 @@ global: loggingImage: beats/filebeat:5.5.0 repository: nexus3.onap.org:10001 dockerhubRepository: docker.io + networkdiscoveryCtxBuilderHost: pomba-networkdiscoveryctxbuilder # application configuration config: |