aboutsummaryrefslogtreecommitdiffstats
path: root/dcae-controller-service/dcae-controller-service-standardeventcollector
diff options
context:
space:
mode:
authorCarsten Lund <lund@research.att.com>2017-05-02 02:14:33 +0000
committerCarsten Lund <lund@research.att.com>2017-05-02 15:08:12 +0000
commit8fc1dbd5956a1e20b8b576cee791271bc3e7c283 (patch)
tree1fe4fd3209616faaf751c61c09ece0569b9973b1 /dcae-controller-service/dcae-controller-service-standardeventcollector
parentec3b44f64b4890694a0f3a1976182f730e268e1f (diff)
[DCAE-15] Changes related to version 1.1 (2)
Change-Id: I52fefc397f789b56095f037acc517b364516b2cb Signed-off-by: Carsten Lund <lund@research.att.com>
Diffstat (limited to 'dcae-controller-service/dcae-controller-service-standardeventcollector')
-rw-r--r--dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java
index 1dd8b09..1f1098a 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java
@@ -58,11 +58,9 @@ public class DcaeControllerServiceStandardeventcollectorServiceProvider extends
@Override
public EObject managerConfiguration(String instanceName) {
- //EObject o1 = ManagerFactory.eINSTANCE.createControllerServiceStandardeventcollectorManager();
ControllerServiceStandardeventcollectorManager o1 = ManagerFactory.eINSTANCE.createControllerServiceStandardeventcollectorManager();
ManagementServer.copy(findInstance(instanceName),o1);
- //o1.setKeystorepwd(JavaHttpClient.decryptPassword(o1.getKeystorepwd()));
-
+ o1.setAuthlist(JavaHttpClient.decryptEmbeddedPassword(o1.getAuthlist()));
return o1;
}