summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRossC <ross.carter@est.tech>2020-06-11 11:24:13 +0100
committerRossC <ross.carter@est.tech>2020-06-11 11:31:10 +0100
commit874a1dcf54a14f28068e237b7d3fa06593fe4eb1 (patch)
treea68331fe4e96357d5461739e7f752d9c7a7dd1fa
parentfd85914999f0364f1a3d3ea74c0e416ffe3b571a (diff)
Switching logging of ToscaPolicyXXXIdentifiers to use new toString()
Issue-ID: POLICY-2078 Change-Id: I035eceb45e76ef11df0e903b584fcf7f8eb63208 Signed-off-by: RossC <ross.carter@est.tech>
-rw-r--r--main/src/main/java/org/onap/policy/pap/main/notification/PolicyNotifier.java5
-rw-r--r--main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeleteProvider.java3
-rw-r--r--main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java10
-rw-r--r--main/src/main/java/org/onap/policy/pap/main/rest/PolicyUndeployerImpl.java5
4 files changed, 13 insertions, 10 deletions
diff --git a/main/src/main/java/org/onap/policy/pap/main/notification/PolicyNotifier.java b/main/src/main/java/org/onap/policy/pap/main/notification/PolicyNotifier.java
index 430a09b9..12630af2 100644
--- a/main/src/main/java/org/onap/policy/pap/main/notification/PolicyNotifier.java
+++ b/main/src/main/java/org/onap/policy/pap/main/notification/PolicyNotifier.java
@@ -3,6 +3,7 @@
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -134,8 +135,8 @@ public class PolicyNotifier {
ToscaPolicyTypeIdentifier type = id2type.get(policyId);
if (type == null) {
- logger.error("group {}:{} refers to non-existent policy {}:{}", group.getName(), subgrp.getPdpType(),
- policyId.getName(), policyId.getVersion());
+ logger.error("group {}:{} refers to non-existent policy {}", group.getName(), subgrp.getPdpType(),
+ policyId);
continue;
}
diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeleteProvider.java b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeleteProvider.java
index 931ad7f0..44450389 100644
--- a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeleteProvider.java
+++ b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeleteProvider.java
@@ -3,6 +3,7 @@
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -154,7 +155,7 @@ public class PdpGroupDeleteProvider extends ProviderBase {
if (matcher.test(ident)) {
result = true;
iter.remove();
- logger.info("remove policy {} {} from subgroup {} {} count={}", ident.getName(), ident.getVersion(),
+ logger.info("remove policy {} from subgroup {} {} count={}", ident,
group.getName(), subgroup.getPdpType(), subgroup.getPolicies().size());
data.trackUndeploy(ident, pdps);
diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java
index 4c0accd3..d09e2ea7 100644
--- a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java
+++ b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java
@@ -3,6 +3,7 @@
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -439,9 +440,8 @@ public class PdpGroupDeployProvider extends ProviderBase {
// add the policy to the subgroup
subgroup.getPolicies().add(desiredIdent);
- logger.info("add policy {} {} to subgroup {} {} count={}", desiredIdent.getName(),
- desiredIdent.getVersion(), group.getName(), subgroup.getPdpType(),
- subgroup.getPolicies().size());
+ logger.info("add policy {} to subgroup {} {} count={}", desiredIdent, group.getName(),
+ subgroup.getPdpType(), subgroup.getPolicies().size());
Set<String> pdps = subgroup.getPdpInstances().stream().map(Pdp::getInstanceId).collect(Collectors.toSet());
data.trackDeploy(desiredIdent, pdps);
@@ -505,8 +505,8 @@ public class PdpGroupDeployProvider extends ProviderBase {
}
// already has the desired policy & version
- logger.info("subgroup {} {} already contains policy {} {}", group.getName(), subgroup.getPdpType(), desnm,
- desvers);
+ logger.info("subgroup {} {} already contains policy {}", group.getName(), subgroup.getPdpType(),
+ desiredIdent);
return true;
}
diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PolicyUndeployerImpl.java b/main/src/main/java/org/onap/policy/pap/main/rest/PolicyUndeployerImpl.java
index f2812087..85ad1280 100644
--- a/main/src/main/java/org/onap/policy/pap/main/rest/PolicyUndeployerImpl.java
+++ b/main/src/main/java/org/onap/policy/pap/main/rest/PolicyUndeployerImpl.java
@@ -3,6 +3,7 @@
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -88,8 +89,8 @@ public class PolicyUndeployerImpl extends ProviderBase implements PolicyUndeploy
continue;
}
- logger.info("remove policy {} {} from subgroup {} {} count={}", ident.getName(), ident.getVersion(),
- group.getName(), subgroup.getPdpType(), subgroup.getPolicies().size());
+ logger.info("remove policy {} from subgroup {} {} count={}", ident, group.getName(),
+ subgroup.getPdpType(), subgroup.getPolicies().size());
updated = true;
data.trackUndeploy(ident, pdps);