From 50ddefb52b2cd90bf762a4e0c1f36752f7589053 Mon Sep 17 00:00:00 2001 From: Carsten Lund Date: Fri, 9 Jun 2017 16:36:17 +0000 Subject: [DCAE-15] Final update for rebased code. Change-Id: I99532ff4415c2da2271116adc694c39313f30d65 Signed-off-by: Carsten Lund --- .../src/main/sirius-gen/DcaeInventory.yaml | 9 +++++++ .../controller/inventory/DcaeDcaeInventory.java | 28 ++++++++++++++++++++++ .../inventory/DcaeDcaeInventoryClient.java | 18 ++++++++++++++ .../inventory/DcaeDcaeInventoryConsole.java | 11 +++++++++ .../DcaeDcaeInventoryProviderTemplate.java | 6 +++++ .../inventory/logging/DcaeInventory.properties | 12 ++++++++++ .../logging/DcaeInventoryMessageEnum.java | 4 +++- .../logging/DcaeInventoryOperationEnum.java | 3 ++- 8 files changed, 89 insertions(+), 2 deletions(-) (limited to 'dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen') 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; -- cgit 1.2.3-korg