summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2021-07-27 13:00:10 +0000
committerGerrit Code Review <gerrit@onap.org>2021-07-27 13:00:10 +0000
commit444816e596227ef1215d1b2dbdf19330a210f936 (patch)
tree841d47102d760d1035e09129eae16e83a461b92f
parent336eeecd5bef17f2252ca9c5f73e4c3e82d08c14 (diff)
parentdee0af57e5420953623e6053cb6d02303001d210 (diff)
Merge "[OOF] Add configuration for Slice termination"
-rw-r--r--kubernetes/oof/resources/config/conf/common_config.yaml8
-rwxr-xr-xkubernetes/oof/resources/config/conf/osdf_config.yaml1
2 files changed, 9 insertions, 0 deletions
diff --git a/kubernetes/oof/resources/config/conf/common_config.yaml b/kubernetes/oof/resources/config/conf/common_config.yaml
index 78afa5e5f8..b1bd0edea4 100644
--- a/kubernetes/oof/resources/config/conf/common_config.yaml
+++ b/kubernetes/oof/resources/config/conf/common_config.yaml
@@ -151,3 +151,11 @@ PCI:
filter:
interval: 10
ml_enabled: false
+
+nxi_termination:
+ query_templates:
+ nsi: "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}') > service-instance*('service-role','e2eserviceprofile-service')"
+ nsi_with_profile: "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}') > service-instance*('service-role','e2eserviceprofile-service')('service-instance-id','{{ printf "{{profile_id}}" }}')"
+ nssi: "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}') > service-instance*('service-role','nsi')"
+ nssi_with_nsi: "service-instance*('service-instance-id','{{ printf "{{instance_id}}" }}') > service-instance*('service-role','nsi')('service-instance-id','{{ printf "{{nsi_id}}" }}')"
+
diff --git a/kubernetes/oof/resources/config/conf/osdf_config.yaml b/kubernetes/oof/resources/config/conf/osdf_config.yaml
index 6df3ed948b..aff63428eb 100755
--- a/kubernetes/oof/resources/config/conf/osdf_config.yaml
+++ b/kubernetes/oof/resources/config/conf/osdf_config.yaml
@@ -55,6 +55,7 @@ aaiServiceInstanceUrl : {{ .Values.config.aaiServiceInstanceUrl }}
aaiGetControllersUrl: {{ .Values.config.aaiGetControllersUrl }}
controllerQueryUrl: {{ .Values.config.controllerQueryUrl }}
aaiGetInterDomainLinksUrl: {{ .Values.config.aaiGetInterDomainLinksUrl }}
+dslQueryPath: /aai/v23/dsl?format=
#DES api
desUrl: {{ .Values.config.desUrl }}