diff options
Diffstat (limited to 'dcae-controller-core/dcae-controller-platform-server/src')
11 files changed, 244 insertions, 24 deletions
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java index ab1cff1..b751d96 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java @@ -38,6 +38,7 @@ import org.json.JSONObject; import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider; import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; import org.openecomp.ncomp.sirius.manager.metrics.MetricManager; +import org.openecomp.ncomp.utils.SecurityUtils; import org.openecomp.ncomp.webservice.utils.DateUtils; import org.openecomp.dcae.controller.core.server.DcaeBasicServer; import org.openecomp.dcae.controller.platform.controller.ControllerCluster; @@ -149,7 +150,7 @@ public class DcaeControllerClusterProvider extends BasicAdaptorProvider implemen public void start() { // System.out.println("CLUSTER: start"); try { - String hostname = InetAddress.getLocalHost().getHostName(); + String hostname = SecurityUtils.getHostName(); if (hostname.indexOf(".") > 0) hostname = hostname.substring(0, hostname.indexOf(".")); o.setMyServerName(hostname); @@ -168,7 +169,7 @@ public class DcaeControllerClusterProvider extends BasicAdaptorProvider implemen } } } - } catch (UnknownHostException e) { + } catch (Exception e) { e.printStackTrace(); } // System.out.println("CLUSTER: start"); diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java index fe8a37f..79b26f2 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java @@ -273,6 +273,7 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro o.setInventory(inv); } inv.poll(); + inv.updateConfiguration(); ecomplogger.recordAuditEventEnd(); } catch (Exception e) { ecomplogger.warn(DcaeControllerMessageEnum.INVENTORY_POLLING_FAILED, e.toString()); @@ -615,16 +616,14 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro for (Iterator<String> i = pub.keys(); i.hasNext();) { String k = i.next(); JSONObject json1 = pub.getJSONObject(k); - if (!k.startsWith("external")) { - String user = "dcae"; - if (json1.has("dcaeLocationName")) - user = json1.getString("dcaeLocationName"); - json1.put("username", user); + String user = "dcae"; + if (json1.has("dcaeLocationName") && ! json1.getString("dcaeLocationName").equals("notSpecified") ) + user = json1.getString("dcaeLocationName"); + json1.put("username", user); + if (json1.has("userpwd")) + json1.put("userpwd", JavaHttpClient.decryptPassword(json1.getString("userpwd"))); + else json1.put("userpwd", password()); - } else { - if (json1.has("userpwd")) - json1.put("userpwd", JavaHttpClient.decryptPassword(json1.getString("userpwd"))); - } if (json1.has("localStreamId")) json1.remove("localStreamId"); if (json1.has("feedId")) @@ -716,17 +715,18 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro } catch (Exception e) { numberOfErrors++; feed.setFeedName("ERROR: " + e.toString()); + e.printStackTrace(); } } private void encryptPasswords(DatabusStreamFeed feed) { for (DatabusStreamFeedPublisher p : feed.getPublishers()) { - if (p.getUserpwd().startsWith("rsa:")) + if (p.getUserpwd() == null || p.getUserpwd().startsWith("rsa:")) continue; p.setUserpwd(encryptPassword(p.getUserpwd())); } for (DatabusStreamFeedSubscriber s : feed.getSubscribers()) { - if (s.getUserpwd().startsWith("rsa:")) + if (s.getUserpwd() == null || s.getUserpwd().startsWith("rsa:")) continue; s.setUserpwd(encryptPassword(s.getUserpwd())); } @@ -1024,12 +1024,13 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro System.out.println("PPPPPPPPPPP 1.1: " + c1.toString(2)); continue; } - if (!uuid.equals(newConfig.getString("uuid").toLowerCase())) + if (!uuid.equalsIgnoreCase(newConfig.getString("uuid"))) continue; a.put(c1); } + default: + throw new RuntimeException("Unknown Policy match type: " + matchingType); } - switch (a.length()) { case 0: System.out.println("PPPPPPPPPPP 0 no policies: " + matchPolicyName + " " + uuid); @@ -1078,13 +1079,13 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro } } - private JSONObject cleanJson(EObject o2) { + public static JSONObject cleanJson(EObject o2) { JSONObject json = ManagementServer.ecore2json(o2, 1000, null, true); removeLastChanged(json); return json; } - private void removeLastChanged(Object o) { + private static void removeLastChanged(Object o) { if (o instanceof JSONObject) { JSONObject json = (JSONObject) o; json.remove("lastChanged"); @@ -1123,7 +1124,7 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro throw new RuntimeException("unknown service instance: " + i); } - protected EList<? extends DcaeServiceInstance> instances(DcaeService s) { + public static EList<? extends DcaeServiceInstance> instances(DcaeService s) { if (s instanceof VirtualMachineService) { VirtualMachineService s1 = (VirtualMachineService) s; return s1.getInstances(); diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java index ba6f379..5165653 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProvider.java @@ -24,6 +24,8 @@ package org.openecomp.dcae.controller.platform.servers.controller.inventory; import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.ncomp.sirius.manager.JavaHttpClient; import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.console.Utils; +import org.yaml.snakeyaml.Yaml; import java.util.ArrayList; import java.util.HashMap; @@ -33,11 +35,14 @@ import java.util.List; import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; import org.json.JSONArray; import org.json.JSONObject; import org.mvel2.optimizers.impl.refl.nodes.ArrayLength; +import org.openecomp.ncomp.core.DeploymentStatus; import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider; - +import org.openecomp.dcae.controller.core.service.DcaeService; +import org.openecomp.dcae.controller.core.service.DcaeServiceInstance; import org.openecomp.dcae.controller.inventory.ApiResponseMessage; import org.openecomp.dcae.controller.inventory.DCAEService; import org.openecomp.dcae.controller.inventory.DCAEServiceGroupByResults; @@ -46,10 +51,18 @@ import org.openecomp.dcae.controller.inventory.DCAEServiceType; import org.openecomp.dcae.controller.inventory.DCAEServiceTypeRequest; import org.openecomp.dcae.controller.inventory.DcaeInventory; import org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults; +import org.openecomp.dcae.controller.inventory.InventoryConfigurationRule; import org.openecomp.dcae.controller.inventory.InventoryPackage; import org.openecomp.dcae.controller.inventory.Link; +import org.openecomp.dcae.controller.platform.controller.DcaePlatformController; +import org.openecomp.dcae.controller.service.cdap.CdapService; +import org.openecomp.dcae.controller.service.cdap.CdapServiceInstance; +import org.openecomp.dcae.controller.service.docker.DockerService; +import org.openecomp.dcae.controller.service.vm.VirtualMachineService; import org.openecomp.dcae.controller.inventory.DcaeServiceResults; +import static org.openecomp.dcae.controller.platform.servers.controller.DcaeDcaePlatformControllerProvider.*; + public class DcaeDcaeInventoryProvider extends BasicAdaptorProvider { private static final Logger logger = Logger.getLogger(DcaeDcaeInventoryProvider.class); DcaeInventory o; @@ -71,7 +84,7 @@ public class DcaeDcaeInventoryProvider extends BasicAdaptorProvider { // TODO handle parameters, but for now only use is complete dump addQuery(query,"offset", offset); JSONObject json = client.httpJsonTransaction("/dcae-service-types" + queryUrl(query), "GET", headers, null); - System.err.println(json.toString(2)); +// System.out.println(json.toString(2)); JSONArray items = json.getJSONArray("items"); for (int i = 0; i < items.length(); i++) { JSONObject item = items.getJSONObject(i); @@ -112,7 +125,7 @@ public class DcaeDcaeInventoryProvider extends BasicAdaptorProvider { // TODO handle parameters, but for now only use is complete dump addQuery(query,"offset", offset); JSONObject json = client.httpJsonTransaction("/dcae-services" + queryUrl(query), "GET", headers, null); - System.err.println(json.toString(2)); +// System.out.println(json.toString(2)); JSONArray items = json.getJSONArray("items"); for (int i = 0; i < items.length(); i++) { JSONObject item = items.getJSONObject(i); @@ -220,7 +233,7 @@ public class DcaeDcaeInventoryProvider extends BasicAdaptorProvider { o.getServiceTypes().addAll(s.getItems()); offset = offset(s.getLinks()); } - System.out.println(ManagementServer.ecore2json(o, 1000, null, true).toString(2)); +// System.out.println(ManagementServer.ecore2json(o, 1000, null, true).toString(2)); } private int offset(EList<Link> links) { @@ -231,4 +244,122 @@ public class DcaeDcaeInventoryProvider extends BasicAdaptorProvider { } return -1; } + + + public void updateConfiguration() { + System.out.println("BBBBBBB: updateConfiguration"); + DcaePlatformController root = (DcaePlatformController) controller.getServer().getObject(); + for (DcaeService s : root.getServices()) { + for (DcaeServiceInstance i : instances(s)) { + if (! ( i instanceof CdapServiceInstance)) continue; + CdapServiceInstance i1 = (CdapServiceInstance) i; + for (InventoryConfigurationRule r : o.getRules()) { + try { + if (r.getServiceNameMatch() != null && ! r.getServiceNameMatch().equals(s.getName())) continue; + if (r.getInstanceNameMatch() != null && ! r.getInstanceNameMatch().equals(i.getName())) continue; + JSONObject json = findBluePrint(r); + System.out.println("BBBBBBB: updateConfiguration " + s.getName() + " " + i.getName() + " " + r + " " + (json ==null ? "NULL" : json.toString(2))); + if (json == null) { + System.out.println("BBBBBBB: NULL"); + continue; + } + EObject oo = controller.getServer().json2ecore(i1.getConfiguration().eClass(), json); + JSONObject before = cleanJson(i1.getConfiguration()); + ManagementServer.merge(i1.getConfiguration(), oo, json, true, null); + JSONObject after = cleanJson(i1.getConfiguration()); + System.out.println("BBBBBBB before: " + before.toString(2)); + System.out.println("BBBBBBB after: " + after.toString(2)); + System.out.println("BBBBBBB equal: " + !before.toString(2).equals(after.toString(2))); + if (!before.toString(2).equals(after.toString(2))) { + System.out.println("BBBBBBB before: " + before.toString(2)); + System.out.println("BBBBBBB after: " + after.toString(2)); + if (i.getStatus() == DeploymentStatus.DEPLOYED) + s.pushManagerConfiguration(i.getName()); + } + } + catch (Exception e) { + e.printStackTrace(System.out); + System.out.println("BBBBBBB: error "+ s.getName() + " " + i.getName() + " " + e); + } + } + } + } + } + + private JSONObject findBluePrint(InventoryConfigurationRule r) { + DCAEServiceType t = null; + int version = -1; + for (DCAEServiceType t1 : o.getServiceTypes()) { + System.out.println("BBBBBBB: type match: " + t1.getTypeName() + " " + r.getTypeNameMatch()); + if (t1.getTypeName() == null) continue; + if ( ! t1.getTypeName().equals(r.getTypeNameMatch())) continue; + System.out.println("BBBBBBB: type version: " + t1.getTypeVersion() + " " + version); + if (t1.getTypeVersion() != null && version > t1.getTypeVersion()) continue; + System.out.println("BBBBBBB: type match found: " + t1.getTypeName()); + t = t1; + } + if (t == null) { + System.out.println("BBBBBBB: no type for: " + r.getServiceNameMatch()); + return null; + } + JSONObject bp; + try { + System.out.println("BBBBBBB: bp 1=" ); + Yaml y = new Yaml(); + System.out.println("BBBBBBB: bp 2="); + bp = (JSONObject) Utils.object2json(y.load(t.getBlueprintTemplate())); + System.out.println("BBBBBBB: bp 3="); + System.out.println("BBBBBBB: bp=" + bp.toString(2)); + JSONObject topology_template = getJSONObject(bp,"topology_template"); + JSONObject node_templates = getJSONObject(topology_template,"node_templates"); + JSONObject node = null; + for (Iterator<String> i = node_templates.keys(); i.hasNext();) { + String type = (String) i.next(); + System.out.println("BBBBBBB: node: " + type); + if (type.matches(r.getBpNodeNameMatch())) node = getJSONObject(node_templates,type); + } + if (node == null) { + System.out.println("BBBBBBB: no node for: " + r.getBpNodeNameMatch()); + return null; + } + JSONObject p = getJSONObject(node,"properties"); + JSONObject app_preferences = getJSONObject(p ,"app_preferences"); + System.out.println("BBBBBBB: app_preferences=" + app_preferences.toString(2)); + JSONObject json = new JSONObject(); + for (Iterator<String> i = app_preferences.keys(); i.hasNext();) { + String path = (String) i.next(); + String a[] = path.split("\\."); + try { + updateJson(json,a,0, app_preferences.get(path)); + } + catch (Exception e) {}; + } + System.out.println("BBBBBBB: fixed value: " + json.toString(2)); + return json; + } + catch (Exception e) { + e.printStackTrace(System.out); + System.out.println("BBBBBBB: bp error=" + e); + return null; + } + } + + private void updateJson(JSONObject json, String[] a, int i, Object v) { + if (i == a.length - 1) { + json.put(a[i], v); + } + else { + if (! json.has(a[i])) + json.put(a[i], new JSONObject()); + updateJson(json.getJSONObject(a[i]), a, i+1, v); + } + } + + private JSONObject getJSONObject(JSONObject json, String key) { + if (json.has(key)) return json.getJSONObject(key); + System.out.println("BBBBBBB: json does not have key =" + json.toString(2) + " " + key); + throw new RuntimeException("Unable to find: " + key); + } + + } diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/DcaeInventory.yaml b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/DcaeInventory.yaml index 6584d46..19c6769 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/DcaeInventory.yaml +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/DcaeInventory.yaml @@ -9,6 +9,7 @@ operations: DcaeInventory@getDcaeServicesService: {} DcaeInventory@createDcaeServicesService: {} DcaeInventory@poll: {} + DcaeInventory@updateConfiguration: {} messages: dummy: {} REQUEST-FAILED-getDcaeServiceTypes: @@ -51,6 +52,10 @@ messages: errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception + REQUEST-FAILED-updateConfiguration: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception REMOTE-CALL-FAILED-getDcaeServiceTypes: errorCode: 4001W messageFormat: '{0}' @@ -91,3 +96,7 @@ messages: errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-updateConfiguration: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventory.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventory.java index 3d41661..498ab56 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventory.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventory.java @@ -352,6 +352,34 @@ public class DcaeDcaeInventory extends DcaeInventoryImpl implements ISiriusProvi } + public void updateConfiguration() { + + long duration_ = 0; + if (server != null) + server.getServer().recordApi(null, this, "updateConfiguration", ApiRequestStatus.START, duration_); + Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DcaeInventoryOperationEnum.DcaeInventory_updateConfiguration,server,this); + ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_updateConfiguration,"self:" + ManagementServer.object2ref(this)); + try { + controller.updateConfiguration(); + } + catch (Exception e) { + duration_ = new Date().getTime()-now_.getTime(); + if (server != null) + server.getServer().recordApi(null, this, "updateConfiguration", ApiRequestStatus.ERROR, duration_); + System.err.println("ERROR: " + e); + ecomplogger.warn(DcaeInventoryMessageEnum.REQUEST_FAILED_updateConfiguration, e.toString()); + EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REQUEST_FAILED_updateConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaeInventoryMessageEnum.REQUEST_FAILED_updateConfiguration, e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + duration_ = new Date().getTime()-now_.getTime(); + if (server != null) + server.getServer().recordApi(null, this, "updateConfiguration", ApiRequestStatus.OKAY, duration_); + + } + diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryClient.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryClient.java index 7d39e55..46c0b31 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryClient.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryClient.java @@ -255,4 +255,22 @@ public class DcaeDcaeInventoryClient extends DcaeInventoryImpl { } + @Override + public void updateConfiguration() { + EClass c = InventoryPackage.eINSTANCE.getDcaeInventory(); + ecomplogger.recordMetricEventStart(DcaeInventoryOperationEnum.DcaeInventory_updateConfiguration,client.getRemote()); + + try { + client.operationPath("/inventory", c, "updateConfiguration", null); + } + catch (Exception e) { + ecomplogger.warn(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_updateConfiguration, e.toString()); + EcompException e1 = EcompException.create(DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_updateConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaeInventoryMessageEnum.REMOTE_CALL_FAILED_updateConfiguration,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + + } + } diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryConsole.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryConsole.java index 6ff8ba7..4259fef 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryConsole.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryConsole.java @@ -164,4 +164,15 @@ public class DcaeDcaeInventoryConsole extends Console { } + public void updateConfiguration() { + + try { + controller.updateConfiguration(); + } + catch (ManagementServerError e) { + System.err.println("ERROR: " + e.getJson().toString(2)); + } + + } + } diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProviderTemplate.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProviderTemplate.java index bfdb66b..dc711a1 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProviderTemplate.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/DcaeDcaeInventoryProviderTemplate.java @@ -115,6 +115,12 @@ public class DcaeDcaeInventoryProviderTemplate extends BasicAdaptorProvider { throw new UnsupportedOperationException(); } + public void updateConfiguration() { + + // TODO IMPLEMENT + throw new UnsupportedOperationException(); + } + diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventory.properties b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventory.properties index 911d8ac..cbba0ed 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventory.properties +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventory.properties @@ -65,6 +65,12 @@ REQUEST_FAILED_poll=\ null|\ Operation Failed with Exception +REQUEST_FAILED_updateConfiguration=\ + REQUEST-FAILED-updateConfiguration-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + REMOTE_CALL_FAILED_getDcaeServiceTypes=\ REMOTE-CALL-FAILED-getDcaeServiceTypes-4001W|\ {0}|\ @@ -124,3 +130,9 @@ REMOTE_CALL_FAILED_poll=\ {0}|\ null|\ Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_updateConfiguration=\ + REMOTE-CALL-FAILED-updateConfiguration-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryMessageEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryMessageEnum.java index 460ac99..5fe1877 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryMessageEnum.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryMessageEnum.java @@ -17,6 +17,7 @@ public enum DcaeInventoryMessageEnum implements EcompMessageEnum { REQUEST_FAILED_getDcaeServicesService, REQUEST_FAILED_createDcaeServicesService, REQUEST_FAILED_poll, + REQUEST_FAILED_updateConfiguration, REMOTE_CALL_FAILED_getDcaeServiceTypes, REMOTE_CALL_FAILED_deleteDcaeServiceTypesType, REMOTE_CALL_FAILED_getDcaeServiceTypesType, @@ -26,7 +27,8 @@ public enum DcaeInventoryMessageEnum implements EcompMessageEnum { REMOTE_CALL_FAILED_deleteDcaeServicesService, REMOTE_CALL_FAILED_getDcaeServicesService, REMOTE_CALL_FAILED_createDcaeServicesService, - REMOTE_CALL_FAILED_poll; + REMOTE_CALL_FAILED_poll, + REMOTE_CALL_FAILED_updateConfiguration; static { EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventory"); diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryOperationEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryOperationEnum.java index 920dfb4..9191fba 100644 --- a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryOperationEnum.java +++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/inventory/logging/DcaeInventoryOperationEnum.java @@ -14,7 +14,8 @@ public enum DcaeInventoryOperationEnum implements EcompOperationEnum { DcaeInventory_deleteDcaeServicesService("DcaeInventory@deleteDcaeServicesService"), DcaeInventory_getDcaeServicesService("DcaeInventory@getDcaeServicesService"), DcaeInventory_createDcaeServicesService("DcaeInventory@createDcaeServicesService"), - DcaeInventory_poll("DcaeInventory@poll") ; + DcaeInventory_poll("DcaeInventory@poll"), + DcaeInventory_updateConfiguration("DcaeInventory@updateConfiguration") ; private String n; |