summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/images/VID_errorReportButton.pngbin0 -> 174279 bytes
-rw-r--r--docs/images/VID_errorReportDownloading.pngbin0 -> 182314 bytes
-rw-r--r--docs/images/VID_errorReportSDC.pngbin0 -> 53986 bytes
-rw-r--r--docs/logging.rst15
-rwxr-xr-xepsdk-app-onap/pom.xml8
-rwxr-xr-xepsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp3
-rwxr-xr-xvid-app-common/pom.xml8
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java6
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java2
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/AaiOverTLSClientInterface.java2
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controller/ErrorReportController.java81
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java10
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/model/GitRepositoryState.java47
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/model/Service.java48
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/model/errorReport/ReportCreationParameters.java48
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogic.java2
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/properties/Features.java3
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/reports/BasicReportGenerator.java110
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/reports/DeploymentReportGenerator.java85
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/reports/ReportGenerator.java32
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerService.java2
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/ProbeInterface.java (renamed from vid-app-common/src/main/java/org/onap/vid/controller/ProbeInterface.java)2
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/ProbeService.java42
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/VidService.java1
-rw-r--r--vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties1
-rw-r--r--vid-app-common/src/main/webapp/WEB-INF/conf/features.properties2
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js3
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js21
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js18
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js35
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js29
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js30
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html2
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.js71
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.test.js119
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.js71
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.test.js117
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.css4
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.html39
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/services/reportService.js27
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm3
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubscriberList.htm3
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiServiceTypes.htm6
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm5
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm7
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm7
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm6
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm4
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm4
-rw-r--r--vid-app-common/src/test/java/org/onap/vid/controller/ErrorReportControllerTest.java115
-rw-r--r--vid-app-common/src/test/java/org/onap/vid/reports/BasicReportGeneratorTest.java165
-rw-r--r--vid-app-common/src/test/java/org/onap/vid/reports/DeploymentReportGeneratorTest.java120
-rw-r--r--vid-app-common/src/test/java/org/onap/vid/services/ProbeServiceTest.java96
-rw-r--r--vid-automation/pom.xml2
-rw-r--r--vid-ext-services-simulator/pom.xml15
-rw-r--r--vid-webpack-master/pom.xml2
56 files changed, 1622 insertions, 84 deletions
diff --git a/docs/images/VID_errorReportButton.png b/docs/images/VID_errorReportButton.png
new file mode 100644
index 000000000..3d3e24eda
--- /dev/null
+++ b/docs/images/VID_errorReportButton.png
Binary files differ
diff --git a/docs/images/VID_errorReportDownloading.png b/docs/images/VID_errorReportDownloading.png
new file mode 100644
index 000000000..8f5f723a1
--- /dev/null
+++ b/docs/images/VID_errorReportDownloading.png
Binary files differ
diff --git a/docs/images/VID_errorReportSDC.png b/docs/images/VID_errorReportSDC.png
new file mode 100644
index 000000000..bd2521017
--- /dev/null
+++ b/docs/images/VID_errorReportSDC.png
Binary files differ
diff --git a/docs/logging.rst b/docs/logging.rst
index 52d18e85f..19205fd58 100644
--- a/docs/logging.rst
+++ b/docs/logging.rst
@@ -25,3 +25,18 @@ Where to Access Log Information
| /opt/app/vid/logs/vid/metrics.log | Application logging | This log holds the metrics info on application's transactions. |
+------------------------------------------------+---------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+
+How to create error report
+--------------------------
+
+In case of error appearance a red button with "Create report" on it, will show up.
+
+.. image:: ./images/VID_errorReportButton.png
+.. image:: ./images/VID_errorReportSDC.png
+
+Pressing that button will show window with data collected from GUI and fetched from API.
+
+.. image:: ./images/VID_errorReportDownloading.png
+
+That data may be download by pressing "download" button.
+**After closing the report window, data may not be available.** \ No newline at end of file
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index f817f8db6..6bb4ffd7a 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -26,7 +26,11 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<epsdk.version>2.4.0</epsdk.version>
<jackson.version>2.9.8</jackson.version>
- <springframework.version>4.3.22.RELEASE</springframework.version>
+ <springframework.version>5.1.6.RELEASE</springframework.version>
+ <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5:
+ org.springframework.orm.hibernate4.HibernateTransactionManager
+ so following orm.version lets epsdk-core find it -->
+ <springframework.orm.version>4.3.22.RELEASE</springframework.orm.version>
<hibernate.version>4.3.11.Final</hibernate.version>
<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
<skipassembly>true</skipassembly>
@@ -427,7 +431,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${springframework.version}</version>
+ <version>${springframework.orm.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
index 13d1d08c9..2410aa2f6 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
@@ -43,6 +43,8 @@
<script src="app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js"></script>
<script src="app/vid/scripts/modals/new-test-environment/new-test-environment.controller.js"></script>
<script src="app/vid/scripts/modals/alert-modal/alert-modal.controller.js"></script>
+<script src="app/vid/scripts/modals/report-modal/report-modal.controller.js"></script>
+<script src="app/vid/scripts/modals/report-modal/report-modal-request.controller.js"></script>
<script src="app/vid/scripts/controller/aaiSubscriberController.js"></script>
<script src="app/vid/scripts/controller/creationDialogController.js"></script>
<script src="app/vid/scripts/controller/iframeDialogController.js"></script>
@@ -87,6 +89,7 @@
<script src="app/vid/scripts/services/vnfService.js"></script>
<script src="app/vid/scripts/services/pnfService.js"></script>
<script src="app/vid/scripts/services/crService.js"></script>
+<script src="app/vid/scripts/services/reportService.js"></script>
<script src="app/vid/scripts/services/change-management.service.js"></script>
<script src="app/vid/scripts/modals/cancel-pending-workflow/cancel-pending-workflow.controller.js"></script>
<script src="app/vid/scripts/services/OwningEntityService.js"></script>
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index d36f5921e..072a891d8 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -26,7 +26,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<epsdk.version>2.4.0</epsdk.version>
- <springframework.version>4.3.22.RELEASE</springframework.version>
+ <springframework.version>5.1.6.RELEASE</springframework.version>
+ <springframework.orm.version>4.3.22.RELEASE</springframework.orm.version>
+ <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5:
+ org.springframework.orm.hibernate4.HibernateTransactionManager
+ so following orm.version lets epsdk-core find it -->
<hibernate.version>4.3.11.Final</hibernate.version>
<jackson.version>2.9.8</jackson.version>
<jersey.version>2.27</jersey.version>
@@ -706,7 +710,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${springframework.version}</version>
+ <version>${springframework.orm.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java
index 7b78f0712..4ef6fbd24 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java
@@ -736,11 +736,7 @@ public class AaiClient implements AaiClientInterface {
}
private static String encodePathSegment(String segmentToEncode) {
- try {
- return UriUtils.encodePathSegment(segmentToEncode, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new GenericUncheckedException("URI encoding failed unexpectedly", e);
- }
+ return UriUtils.encodePathSegment(segmentToEncode, "UTF-8");
}
@Override
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java
index 3f914649d..5f69b8769 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiClientInterface.java
@@ -31,7 +31,7 @@ import org.onap.vid.aai.model.AaiGetTenatns.GetTenantsResponse;
import org.onap.vid.aai.model.PortDetailsTranslator;
import org.onap.vid.aai.model.Properties;
import org.onap.vid.aai.model.ResourceType;
-import org.onap.vid.controller.ProbeInterface;
+import org.onap.vid.services.ProbeInterface;
import org.onap.vid.model.SubscriberList;
/**
* Created by Oren on 7/4/17.
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/AaiOverTLSClientInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/AaiOverTLSClientInterface.java
index 4cc95890d..d2c208ea7 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/AaiOverTLSClientInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/AaiOverTLSClientInterface.java
@@ -23,7 +23,7 @@ package org.onap.vid.aai;
import io.joshworks.restclient.http.HttpResponse;
import org.onap.portalsdk.core.util.SystemProperties;
import org.onap.vid.aai.model.ResourceType;
-import org.onap.vid.controller.ProbeInterface;
+import org.onap.vid.services.ProbeInterface;
import org.onap.vid.model.SubscriberList;
public interface AaiOverTLSClientInterface extends ProbeInterface {
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/ErrorReportController.java b/vid-app-common/src/main/java/org/onap/vid/controller/ErrorReportController.java
new file mode 100644
index 000000000..38a69faa8
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/ErrorReportController.java
@@ -0,0 +1,81 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.vid.controller;
+
+import org.jetbrains.annotations.NotNull;
+import org.onap.portalsdk.core.controller.RestrictedBaseController;
+import org.onap.portalsdk.core.controller.UnRestrictedBaseController;
+import org.onap.vid.model.errorReport.ReportCreationParameters;
+import org.onap.vid.reports.ReportGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BinaryOperator;
+
+@RestController
+public class ErrorReportController extends RestrictedBaseController {
+
+ private final List<ReportGenerator> providers;
+
+ @Autowired
+ public ErrorReportController(List<ReportGenerator> reportGenerators) {
+ providers = reportGenerators;
+ }
+
+ @PostMapping(value = "error-report")
+ public Map<String, Object> getErrorReport(HttpServletRequest request,
+ @RequestBody ReportCreationParameters creationParameters) {
+ return generateReportsData(request, creationParameters);
+ }
+
+ @NotNull
+ HashMap<String, Object> generateReportsData(HttpServletRequest request, ReportCreationParameters creationParameters) {
+ return providers
+ .stream()
+ .filter(provider -> provider.canGenerate(creationParameters))
+ .map(provider -> provider.apply(request, creationParameters))
+ .map(Map::entrySet)
+ .flatMap(Collection::parallelStream)
+ .reduce(new HashMap<>(), this::putAndGet, concatenateMap());
+ }
+
+ @NotNull
+ private HashMap<String, Object> putAndGet(HashMap<String, Object> map, Map.Entry<String, Object> entry) {
+ map.put(entry.getKey(), entry.getValue());
+ return map;
+ }
+
+ @NotNull
+ private BinaryOperator<HashMap<String, Object>> concatenateMap() {
+ return (map1, map2) -> {
+ map1.putAll(map2);
+ return map1;
+ };
+ }
+
+} \ No newline at end of file
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java b/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java
index c181c6f30..26a8add6a 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java
@@ -22,27 +22,27 @@ package org.onap.vid.controller;
import org.onap.portalsdk.core.controller.RestrictedBaseController;
import org.onap.vid.model.probes.ExternalComponentStatus;
+import org.onap.vid.services.ProbeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-import java.util.stream.Collectors;
@RestController
@RequestMapping("probe")
public class ProbeController extends RestrictedBaseController {
- private final List<ProbeInterface> probes;
+ final private ProbeService probeService;
@Autowired
- public ProbeController(List<ProbeInterface> probes) {
- this.probes = probes;
+ public ProbeController(ProbeService probeService) {
+ this.probeService = probeService;
}
@GetMapping
public List<ExternalComponentStatus> getProbe() {
- return probes.stream().map(ProbeInterface::probeComponent).collect(Collectors.toList());
+ return probeService.getProbe();
}
}
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/GitRepositoryState.java b/vid-app-common/src/main/java/org/onap/vid/model/GitRepositoryState.java
index f7c56b7b6..a6419ef42 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/GitRepositoryState.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/GitRepositoryState.java
@@ -7,9 +7,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,25 +24,34 @@ import java.util.Properties;
public class GitRepositoryState {
- private final String commitId;
- private final String commitMessageShort;
- private final String commitTime;
+ public static final GitRepositoryState EMPTY = new GitRepositoryState("", "", "");
- public GitRepositoryState(Properties properties) {
- this.commitId = String.valueOf(properties.get("git.commit.id"));
- this.commitMessageShort = String.valueOf(properties.get("git.commit.message.short"));
- this.commitTime = String.valueOf(properties.get("git.commit.time"));
- }
+ private final String commitId;
+ private final String commitMessageShort;
+ private final String commitTime;
- public String getCommitId() {
- return commitId;
- }
+ public GitRepositoryState(Properties properties) {
+ this(String.valueOf(String.valueOf(properties.get("git.commit.id"))),
+ String.valueOf(properties.get("git.commit.message.short")),
+ String.valueOf(properties.get("git.commit.time"))
+ );
+ }
- public String getCommitMessageShort() {
- return commitMessageShort;
- }
+ private GitRepositoryState(String commitId, String commitMessageShort, String commitTime) {
+ this.commitId = commitId;
+ this.commitMessageShort = commitMessageShort;
+ this.commitTime = commitTime;
+ }
- public String getCommitTime() {
- return commitTime;
- }
+ public String getCommitId() {
+ return commitId;
+ }
+
+ public String getCommitMessageShort() {
+ return commitMessageShort;
+ }
+
+ public String getCommitTime() {
+ return commitTime;
+ }
}
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/Service.java b/vid-app-common/src/main/java/org/onap/vid/model/Service.java
index bb6c92e89..016828381 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/Service.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/Service.java
@@ -33,19 +33,19 @@ public class Service {
/** The uuid. */
private String uuid;
-
+
/** The invariant uuid. */
private String invariantUuid;
-
+
/** The name. */
private String name;
-
+
/** The version. */
private String version;
-
+
/** The tosca model URL. */
private String toscaModelURL;
-
+
/** The category. */
private String category;
@@ -54,10 +54,10 @@ public class Service {
/** The Service Role */
private String serviceRole;
-
+
/** The description. */
private String description;
-
+
/** The service ecomp naming flag */
private String serviceEcompNaming;
@@ -77,7 +77,7 @@ public class Service {
public String getUuid() {
return uuid;
}
-
+
/**
* Gets the invariant uuid.
*
@@ -86,7 +86,7 @@ public class Service {
public String getInvariantUuid() {
return invariantUuid;
}
-
+
/**
* Gets the name.
*
@@ -95,7 +95,7 @@ public class Service {
public String getName() {
return name;
}
-
+
/**
* Gets the version.
*
@@ -104,7 +104,7 @@ public class Service {
public String getVersion() {
return version;
}
-
+
/**
* Gets the tosca model URL.
*
@@ -113,7 +113,7 @@ public class Service {
public String getToscaModelURL() {
return toscaModelURL;
}
-
+
/**
* Gets the category.
*
@@ -122,7 +122,7 @@ public class Service {
public String getCategory() {
return category;
}
-
+
/**
* Gets the description.
*
@@ -131,7 +131,7 @@ public class Service {
public String getDescription() {
return description;
}
-
+
/**
* Gets the inputs.
*
@@ -161,7 +161,7 @@ public class Service {
public void setUuid(String uuid) {
this.uuid = uuid;
}
-
+
/**
* Sets the invariant uuid.
*
@@ -170,7 +170,7 @@ public class Service {
public void setInvariantUuid(String invariantUuid) {
this.invariantUuid = invariantUuid;
}
-
+
/**
* Sets the name.
*
@@ -179,7 +179,7 @@ public class Service {
public void setName(String name) {
this.name = name;
}
-
+
/**
* Sets the version.
*
@@ -188,7 +188,7 @@ public class Service {
public void setVersion(String version) {
this.version = version;
}
-
+
/**
* Sets the tosca model URL.
*
@@ -197,7 +197,7 @@ public class Service {
public void setToscaModelURL(String toscaModelURL) {
this.toscaModelURL = toscaModelURL;
}
-
+
/**
* Sets the category.
*
@@ -206,7 +206,7 @@ public class Service {
public void setCategory(String category) {
this.category = category;
}
-
+
/**
* Sets the description.
*
@@ -215,7 +215,7 @@ public class Service {
public void setDescription(String description) {
this.description = description;
}
-
+
/**
* Sets the inputs.
*
@@ -239,7 +239,7 @@ public class Service {
public int hashCode() {
return UUID.fromString(getUuid()).hashCode();
}
-
+
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
@@ -247,9 +247,9 @@ public class Service {
public boolean equals(Object o) {
if (o == this) return true;
if (!(o instanceof Service)) return false;
-
+
final Service service = (Service) o;
-
+
return (service.getUuid().equals(getUuid()));
}
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/errorReport/ReportCreationParameters.java b/vid-app-common/src/main/java/org/onap/vid/model/errorReport/ReportCreationParameters.java
new file mode 100644
index 000000000..babbf8906
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/model/errorReport/ReportCreationParameters.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.vid.model.errorReport;
+
+public class ReportCreationParameters {
+ private String requestId;
+ private String serviceUuid;
+
+ public ReportCreationParameters() {}
+
+ public ReportCreationParameters(String requestId, String serviceUuid) {
+ this.requestId = requestId;
+ this.serviceUuid = serviceUuid;
+ }
+
+ public String getRequestId() {
+ return requestId;
+ }
+
+ public String getServiceUuid() {
+ return serviceUuid;
+ }
+
+ public void setRequestId(String requestId) {
+ this.requestId = requestId;
+ }
+
+ public void setServiceUuid(String serviceUuid) {
+ this.serviceUuid = serviceUuid;
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogic.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogic.java
index ed64d2066..cc3231582 100644
--- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogic.java
+++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogic.java
@@ -24,7 +24,7 @@ package org.onap.vid.mso;
import org.onap.vid.changeManagement.RequestDetailsWrapper;
import org.onap.vid.changeManagement.WorkflowRequestDetail;
import org.onap.vid.controller.OperationalEnvironmentController;
-import org.onap.vid.controller.ProbeInterface;
+import org.onap.vid.services.ProbeInterface;
import org.onap.vid.model.SOWorkflowList;
import org.onap.vid.model.SoftDeleteRequest;
import org.onap.vid.mso.model.OperationalEnvironmentActivateInfo;
diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
index 1c68e8292..ea047d698 100644
--- a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
+++ b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
@@ -62,7 +62,8 @@ public enum Features implements Feature {
FLAG_1902_NEW_VIEW_EDIT,
FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER,
FLAG_1902_VNF_GROUPING,
- FLAG_HANDLE_SO_WORKFLOWS
+ FLAG_HANDLE_SO_WORKFLOWS,
+ FLAG_CREATE_ERROR_REPORTS
;
public boolean isActive() {
diff --git a/vid-app-common/src/main/java/org/onap/vid/reports/BasicReportGenerator.java b/vid-app-common/src/main/java/org/onap/vid/reports/BasicReportGenerator.java
new file mode 100644
index 000000000..00f8077d3
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/reports/BasicReportGenerator.java
@@ -0,0 +1,110 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.vid.reports;
+
+import com.google.common.collect.ImmutableMap;
+import io.joshworks.restclient.http.HttpResponse;
+import org.onap.vid.controller.ControllersUtils;
+import org.onap.vid.model.GitRepositoryState;
+import org.onap.vid.model.SubscriberList;
+import org.onap.vid.model.errorReport.ReportCreationParameters;
+import org.onap.vid.model.probes.ExternalComponentStatus;
+import org.onap.vid.services.AaiService;
+import org.onap.vid.services.ProbeService;
+import org.onap.vid.utils.SystemPropertiesWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.onap.portalsdk.core.util.SystemProperties.ECOMP_REQUEST_ID;
+
+@Component
+public class BasicReportGenerator implements ReportGenerator {
+
+ private static final String GIT_PROPERTIES_FILENAME = "git.properties";
+ private final AaiService aaiService;
+ private final SystemPropertiesWrapper systemPropertiesWrapper;
+ private final ProbeService probeService;
+
+ @Autowired
+ public BasicReportGenerator(AaiService aaiService, SystemPropertiesWrapper systemPropertiesWrapper,
+ ProbeService probeService) {
+ this.aaiService = aaiService;
+ this.systemPropertiesWrapper = systemPropertiesWrapper;
+ this.probeService = probeService;
+ }
+
+ @Override
+ public Map<String, Object> apply(HttpServletRequest request, ReportCreationParameters creationParameters) {
+ return ImmutableMap.<String, Object>builder()
+ .put("X-ECOMP-RequestID", request.getHeader(ECOMP_REQUEST_ID))
+ .put("aaiFullSubscriberList", getFullSubscriberList())
+ .put("userID", getUserIDFromSystemProperties(request))
+ .put("commitInfo", getCommitInfoFromGitProperties())
+ .put("probeInfo", getProbe())
+ .build();
+ }
+
+ @Override
+ public boolean canGenerate(ReportCreationParameters creationParameters) {
+ return true;
+ }
+
+ private GitRepositoryState getCommitInfoFromGitProperties() {
+ GitRepositoryState gitRepositoryState;
+ try (InputStream resourceAsStream = getClass().getClassLoader().getResourceAsStream(GIT_PROPERTIES_FILENAME)) {
+ Properties properties = new Properties();
+ properties.load(resourceAsStream);
+ gitRepositoryState = new GitRepositoryState(properties);
+ } catch (IOException e) {
+ gitRepositoryState = GitRepositoryState.EMPTY;
+ }
+ return gitRepositoryState;
+ }
+
+ String getUserIDFromSystemProperties(HttpServletRequest request) {
+ return new ControllersUtils(systemPropertiesWrapper).extractUserId(request);
+ }
+
+ List<ExternalComponentStatus> getProbe() {
+ return probeService.getProbe();
+ }
+
+ ImmutableMap<String, Object> getFullSubscriberList() {
+ ImmutableMap<String, Object> fullSubscriberList;
+ try {
+ HttpResponse<SubscriberList> fullSubscriberListResponse = aaiService.getFullSubscriberList();
+ fullSubscriberList = ImmutableMap.<String, Object>builder()
+ .put("status", fullSubscriberListResponse.getStatus())
+ .put("body", fullSubscriberListResponse.getBody())
+ .put("headers", fullSubscriberListResponse.getHeaders())
+ .build();
+ } catch (Exception e) {
+ fullSubscriberList = ImmutableMap.of("exception", e.toString());
+ }
+ return fullSubscriberList;
+ }
+}
diff --git a/vid-app-common/src/main/java/org/onap/vid/reports/DeploymentReportGenerator.java b/vid-app-common/src/main/java/org/onap/vid/reports/DeploymentReportGenerator.java
new file mode 100644
index 000000000..da845266d
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/reports/DeploymentReportGenerator.java
@@ -0,0 +1,85 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.vid.reports;
+
+import com.google.common.collect.ImmutableMap;
+import org.onap.vid.asdc.AsdcCatalogException;
+import org.onap.vid.model.errorReport.ReportCreationParameters;
+import org.onap.vid.mso.MsoBusinessLogic;
+import org.onap.vid.mso.MsoResponseWrapper;
+import org.onap.vid.services.VidService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class DeploymentReportGenerator implements ReportGenerator {
+
+ private final VidService vidService;
+ private final MsoBusinessLogic msoBusinessLogic;
+
+ @Autowired
+ public DeploymentReportGenerator(VidService vidService, MsoBusinessLogic msoBusinessLogic) {
+ this.vidService = vidService;
+ this.msoBusinessLogic = msoBusinessLogic;
+ }
+
+ @Override
+ public Map<String, Object> apply(HttpServletRequest request, ReportCreationParameters creationParameters) {
+ return ImmutableMap.<String, Object>builder()
+ .put("serviceInstanceInfo", getOrchestrationRequestFromMso(creationParameters.getRequestId()))
+ .put("serviceDetails", getServiceDetails(creationParameters.getServiceUuid()))
+ .build();
+ }
+
+ @Override
+ public boolean canGenerate(ReportCreationParameters creationParameters) {
+ return creationParameters.getRequestId() != null && creationParameters.getServiceUuid() != null;
+ }
+
+ MsoResponseWrapper getOrchestrationRequestFromMso(String requestId) {
+ return msoBusinessLogic.getOrchestrationRequest(requestId);
+ }
+
+ Map<String, Object> getServiceDetails(String serviceUuid) {
+ Map<String, Object> serviceDetails;
+ try {
+ org.onap.vid.model.Service serviceModel = vidService.getService(serviceUuid).getService();
+ serviceDetails = ImmutableMap.of("details", serviceModel);
+ } catch (AsdcCatalogException | NullPointerException e) {
+ serviceDetails = generateServiceDetailsExceptionResponse(serviceUuid, e);
+ }
+ return serviceDetails;
+ }
+
+ Map<String, Object> generateServiceDetailsExceptionResponse(String serviceUuid, Exception e) {
+ Map<String, Object> result = new HashMap<>();
+ if (e.getClass() == NullPointerException.class) {
+ result.put("message", "Service details for given uuid were not found");
+ }
+ result.put("exception", e.toString());
+ result.put("serviceUuid", serviceUuid);
+ return result;
+ }
+}
diff --git a/vid-app-common/src/main/java/org/onap/vid/reports/ReportGenerator.java b/vid-app-common/src/main/java/org/onap/vid/reports/ReportGenerator.java
new file mode 100644
index 000000000..ccc290115
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/reports/ReportGenerator.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.vid.reports;
+
+import org.onap.vid.model.errorReport.ReportCreationParameters;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+import java.util.function.BiFunction;
+
+public interface ReportGenerator extends BiFunction<HttpServletRequest, ReportCreationParameters, Map<String, Object>>{
+
+ boolean canGenerate(ReportCreationParameters creationParameters);
+
+}
diff --git a/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerService.java b/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerService.java
index 643cd22af..c74321dec 100644
--- a/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerService.java
+++ b/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerService.java
@@ -20,7 +20,7 @@
package org.onap.vid.scheduler;
-import org.onap.vid.controller.ProbeInterface;
+import org.onap.vid.services.ProbeInterface;
public interface SchedulerService extends ProbeInterface {
}
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/ProbeInterface.java b/vid-app-common/src/main/java/org/onap/vid/services/ProbeInterface.java
index 1b3265971..7fbc9883e 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/ProbeInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/ProbeInterface.java
@@ -17,7 +17,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-package org.onap.vid.controller;
+package org.onap.vid.services;
import org.onap.vid.model.probes.ExternalComponentStatus;
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/ProbeService.java b/vid-app-common/src/main/java/org/onap/vid/services/ProbeService.java
new file mode 100644
index 000000000..b2062d535
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/services/ProbeService.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.vid.services;
+
+import org.onap.vid.model.probes.ExternalComponentStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class ProbeService {
+
+ private final List<ProbeInterface> probes;
+
+ @Autowired
+ public ProbeService(List<ProbeInterface> probes) {
+ this.probes = probes;
+ }
+
+ public List<ExternalComponentStatus> getProbe(){
+ return probes.stream().map(ProbeInterface::probeComponent).collect(Collectors.toList());
+ }
+}
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/VidService.java b/vid-app-common/src/main/java/org/onap/vid/services/VidService.java
index 18d8398a3..f7bc1f275 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/VidService.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/VidService.java
@@ -22,7 +22,6 @@
package org.onap.vid.services;
import org.onap.vid.asdc.AsdcCatalogException;
-import org.onap.vid.controller.ProbeInterface;
import org.onap.vid.model.ServiceModel;
public interface VidService extends ProbeInterface {
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
index 8ba148465..96903a4c7 100644
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
@@ -9,6 +9,7 @@ FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false
FLAG_SERVICE_MODEL_CACHE = true
FLAG_SHOW_ASSIGNMENTS = true
FLAG_HANDLE_SO_WORKFLOWS = true
+FLAG_CREATE_ERROR_REPORTS = true
FLAG_SHOW_VERIFY_SERVICE = true
FLAG_DUPLICATE_VNF = true
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
index 7bdc65919..b7634aa45 100644
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties
@@ -26,6 +26,7 @@ FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = true
FLAG_1810_AAI_LOCAL_CACHE = true
FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
FLAG_HANDLE_SO_WORKFLOWS = true
+FLAG_CREATE_ERROR_REPORTS = false
# Modern UI (Drawing-Board; View/Edit)
# - - - - - - - - - - - - - - - - - -
@@ -46,3 +47,4 @@ FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI = false
FLAG_SUPPLEMENTARY_FILE = false
FLAG_1902_NEW_VIEW_EDIT=false
FLAG_1902_VNF_GROUPING = false
+
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
index fc3d8f792..5c5801805 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
@@ -258,7 +258,8 @@ appDS2
FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST: "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST",
FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY: "FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY",
FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE: "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE",
- FLAG_HANDLE_SO_WORKFLOWS: "FLAG_HANDLE_SO_WORKFLOWS"
+ FLAG_HANDLE_SO_WORKFLOWS: "FLAG_HANDLE_SO_WORKFLOWS",
+ FLAG_CREATE_ERROR_REPORTS: "FLAG_CREATE_ERROR_REPORTS"
}
};
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
index 0705812f7..62ef1a4f2 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
@@ -22,8 +22,8 @@
(function () {
'use strict';
- appDS2.controller("ServiceModelController", function ($scope, $http, $location, COMPONENT, VIDCONFIGURATION, FIELD, DataService, vidService,
- PropertyService, UtilityService, AsdcService,$timeout) {
+ appDS2.controller("ServiceModelController",function ($uibModal, $scope, $http, $location, COMPONENT, VIDCONFIGURATION, FIELD, DataService, vidService,
+ PropertyService, UtilityService, AsdcService, $timeout, featureFlags) {
$scope.popup = {};
var defaultViewPerPage = 10;
@@ -132,7 +132,24 @@
$scope.currentPage++;
};
+ $scope.showReportWindow = function() {
+ const modalWindow = $uibModal.open({
+ templateUrl: 'app/vid/scripts/modals/report-modal/report-modal.html',
+ controller: 'reportModalController',
+ controllerAs: 'vm',
+ resolve: {
+ errorMsg: function () {
+ return $scope.status;
+ }
+ }
+ });
+
+ };
+
+ $scope.isShowErrorReport = function() {
+ return featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_CREATE_ERROR_REPORTS);
+ };
$scope.createType = COMPONENT.A_LA_CARTE;
$scope.deployService = function(service) {
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
index 16ec01dfd..191251860 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
@@ -24,6 +24,20 @@
appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER", "DataService", "PropertyService", "$scope", "$http", "$timeout", "$location", "$log", "$route", "$uibModal", "VIDCONFIGURATION", "UtilityService", "vidService", "AaiService", "MsoService", "OwningEntityService", "AsdcService","featureFlags", "$q", "_",
function (COMPONENT, FIELD, PARAMETER, DataService, PropertyService, $scope, $http, $timeout, $location, $log, $route, $uibModal, VIDCONFIGURATION, UtilityService, vidService, AaiService, MsoService, OwningEntityService, AsdcService, featureFlags, $q, _) {
+ $scope.showReportWindow = function() {
+
+ const modalWindow = $uibModal.open({
+ templateUrl: 'app/vid/scripts/modals/report-modal/report-modal.html',
+ controller: 'reportModalController',
+ controllerAs: 'vm',
+ resolve: {
+ errorMsg: function () {
+ return $scope.errorMsg;
+ }
+ }
+ });
+ };
+
$scope.showVnfDetails = function (vnf) {
console.log("showVnfDetails");
DataService.setVnfInstanceId(COMPONENT.VNF_INSTANCE_ID);
@@ -728,6 +742,10 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
return featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_SHOW_VERIFY_SERVICE);
}
+ $scope.isShowErrorReport = function() {
+ return featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_CREATE_ERROR_REPORTS);
+ }
+
$scope.isEnableVerifyService = function () {
//Button should only be enabled when the service type is A la carte
if (DataService.getALaCarte()) {
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
index 57bf54bb6..15627835e 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js
@@ -21,15 +21,46 @@
"use strict";
var creationDialogController = function (COMPONENT, FIELD, PARAMETER, $scope, $http, $timeout, $log,
- CreationService, UtilityService, DataService, VIDCONFIGURATION, $location) {
+ CreationService, UtilityService, DataService, VIDCONFIGURATION, $location, $uibModal, featureFlags) {
$scope.isDialogVisible = false;
+ $scope.isServiceError = false;
$scope.summaryControl = {};
$scope.userProvidedControl = {};
+
var callbackFunction = undefined;
var componentId = undefined;
+ $scope.showReportWindow = function() {
+
+ let errorMsg;
+
+ if($scope.error !== undefined && $scope.error != null) {
+ errorMsg = $scope.error;
+ } else {
+ errorMsg = "";
+ }
+
+ const modalWindow = $uibModal.open({
+ templateUrl: 'app/vid/scripts/modals/report-modal/report-modal.html',
+ controller: 'reportModalController',
+ controllerAs: 'vm',
+ resolve: {
+ errorMsg: function () {
+ return errorMsg;
+ }
+ }
+ });
+
+ $scope.isDialogVisible = false;
+ $scope.popup.isVisible = false;
+ };
+
+ $scope.isShowErrorReport = function() {
+ return featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_CREATE_ERROR_REPORTS);
+ };
+
$scope.shouldShowOldPopup = function () {
return !DataService.getShouldIncludeInAsyncInstantiationFlow();
};
@@ -68,6 +99,7 @@ var creationDialogController = function (COMPONENT, FIELD, PARAMETER, $scope, $h
CreationService.initializeComponent(request.componentId);
CreationService.setHttpErrorHandler(function (response) {
+ $scope.isServiceError = true;
showError(FIELD.ERROR.SYSTEM_FAILURE, UtilityService
.getHttpErrorMessage(response));
});
@@ -373,4 +405,5 @@ var creationDialogController = function (COMPONENT, FIELD, PARAMETER, $scope, $h
appDS2.controller("creationDialogController", ["COMPONENT", "FIELD", "PARAMETER", "$scope", "$http",
"$timeout", "$log", "CreationService", "UtilityService", "DataService", "VIDCONFIGURATION", "$location",
+ "$uibModal", "featureFlags",
creationDialogController]);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js
index 9bb439fe3..e4c75fbe7 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/msoCommitController.js
@@ -63,8 +63,8 @@
* "$scope.popup".
*/
-var msoCommitController = function(COMPONENT, FIELD, $scope, $http, $timeout, $window, $log,
- MsoService, PropertyService, UtilityService, TestEnvironmentsService) {
+var msoCommitController = function(COMPONENT, FIELD, $scope, $http, $timeout, $window, $log, $uibModal,
+ MsoService, PropertyService, UtilityService, TestEnvironmentsService, DataService) {
$scope.isViewVisible = false;
$scope.progressBarControl = {};
@@ -72,6 +72,29 @@ var msoCommitController = function(COMPONENT, FIELD, $scope, $http, $timeout, $w
var getRequestStatusFunc = getOrchestrationRequestStatus; //default
var _this = this;
+ $scope.showReportWindow = function() {
+ let requestInfo = {};
+ requestInfo.requestId = _this.requestId;
+ requestInfo.serviceUuid = $scope.service.model.service.uuid;
+
+ const modalWindow = $uibModal.open({
+ templateUrl: 'app/vid/scripts/modals/report-modal/report-modal.html',
+ controller: 'reportModalInstanceController',
+ controllerAs: 'vm',
+ resolve: {
+ errorMsg: function () {
+ return $scope.log;
+ },
+ requestInfo: function () {
+ return requestInfo;
+ }
+ }
+ });
+
+ $scope.isViewVisible = false;
+ $scope.popup.isVisible = false;
+ };
+
$scope.$on("createInstance", function(event, request) {
init(request, COMPONENT.MSO_CREATE_REQ, getOrchestrationRequestStatus );
MsoService.createInstance(request, handleInitialResponse);
@@ -318,5 +341,5 @@ var msoCommitController = function(COMPONENT, FIELD, $scope, $http, $timeout, $w
}
appDS2.controller("msoCommitController", [ "COMPONENT", "FIELD", "$scope", "$http", "$timeout",
- "$window", "$log", "MsoService", "PropertyService", "UtilityService", "TestEnvironmentsService",
+ "$window", "$log", "$uibModal", "MsoService", "PropertyService", "UtilityService", "TestEnvironmentsService", "DataService",
msoCommitController ]);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
index 2eaa7513e..eea501f15 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.controller.js
@@ -26,8 +26,10 @@
function newChangeManagementModalController($uibModalInstance, $uibModal,$q, AaiService, changeManagementService, Upload, $log, $scope, _, COMPONENT, VIDCONFIGURATION, DataService, featureFlags) {
+
var vm = this;
vm.hasScheduler = !!VIDCONFIGURATION.SCHEDULER_PORTAL_URL;
+ vm.errorMsg='';
vm.wizardStep = 1;
vm.nextStep = function(){
@@ -43,6 +45,24 @@
var attuid;
+ $scope.showReportWindow = function() {
+ const modalWindow = $uibModal.open({
+ templateUrl: 'app/vid/scripts/modals/report-modal/report-modal.html',
+ controller: 'reportModalController',
+ controllerAs: 'vm',
+ resolve: {
+ errorMsg: function () {
+ return vm.errorMsg.message;
+ }
+ }
+ });
+
+ };
+
+ $scope.isShowErrorReport = function() {
+ return featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_CREATE_ERROR_REPORTS);
+ };
+
function fetchAttUid() {
var defer = $q.defer();
if (attuid) {
@@ -54,6 +74,7 @@
},
function (err) {
defer.reject(err);
+ vm.errorMsg = err;
});
}
return defer.promise;
@@ -75,6 +96,7 @@
})
.catch(function (error) {
$log.error(error);
+ vm.errorMsg = err;
})
};
@@ -132,6 +154,7 @@
newVNFName.availableVersions = _.sortBy(_.uniq(versions, response.data.service, true),"modelInfo.modelVersion");
}).catch(function (error) {
$log.error(error);
+ vm.errorMsg = error;
});
});
}
@@ -372,6 +395,7 @@
}
}catch(err){
$log.error('SchedulerCtrl::extractChangeManagementCallbackDataStr error: ' + err);
+ vm.errorMsg = err;
}
result.requestDetails.push(data);
@@ -475,6 +499,7 @@
})
.catch(function (error) {
$log.error(error);
+ vm.errorMsg = error;
});
};
@@ -602,6 +627,7 @@
})
.catch(function (error) {
reject(error);
+ vm.errorMsg = error;
});
});
}
@@ -708,6 +734,7 @@
vm.localWorkflows = response.data.workflows || [];
}).catch(function (error) {
$log.error(error);
+ vm.errorMsg = error;
});
};
@@ -718,6 +745,7 @@
vm.remoteWorkflows = response.data || [];
}).catch(function (error) {
$log.error(error);
+ vm.errorMsg = error;
});
};
@@ -734,6 +762,7 @@
})
.catch(function (error) {
$log.error(error);
+ vm.errorMsg = error;
});
};
@@ -826,6 +855,7 @@
vnfName[0].selectedFile = JSON.parse(lines);
} catch (error) {
$log.error(error);
+ vm.errorMsg = error;
}
};
fileReader.readAsText(file);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
index 611b8e5ef..7ccddbafd 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
@@ -22,6 +22,7 @@
<div class="modal-header">
<h3 class="modal-title" id="modal-title">New VNF Change</h3>
<span ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
+ <div ng-if="vm.errorMsg!==''"><font color='red'>{{vm.errorMsg.message}}</font></div>
</div>
<form class="form-create" name="newChangeManagement" ng-submit="vm.openModal();vm.close();" novalidate>
<div class="modal-body step1" ng-show="vm.wizardStep === 1" >
@@ -156,6 +157,7 @@
<button type="button" id="cancel" name="cancel" class="btn btn-white" ng-click="vm.close()">Cancel</button>
<button ng-if="!vm.isScaleOut() || (vm.isScaleOut() && vm.wizardStep === 2)" type="submit" id="submit" name="submit" class="btn btn-primary" data-ng-disabled="newChangeManagement.$invalid">{{vm.hasScheduler ? "Schedule" : "Confirm"}}</button>
<button ng-if="vm.isScaleOut() && vm.wizardStep === 1" ng-click="vm.nextStep();" type="button" id="next" name="next" class="btn btn-primary" data-ng-disabled="newChangeManagement.$invalid">Next</button>
+ <button ng-if="isShowErrorReport() && vm.errorMsg!==''" ng-click="showReportWindow()" type="button" class="btn btn-danger" >Create report</button>
</div>
</div>
</form>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.js
new file mode 100644
index 000000000..6b69a08fe
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.js
@@ -0,0 +1,71 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+(function () {
+ 'use strict';
+
+ appDS2.controller("reportModalInstanceController", ["$uibModalInstance", "$scope", "$window", "DataService", "ReportService", "errorMsg", "requestInfo", reportModalInstanceController]);
+
+ function reportModalInstanceController($uibModalInstance, $scope, $window, DataService, ReportService, errorMsg, requestInfo) {
+ const vm = this;
+
+ const init = function() {
+ vm.timestamp = ReportService.getReportTimeStamp();
+ vm.downloadEnable = false;
+ $scope.isSpinnerVisible = true;
+
+ ReportService.getReportData(requestInfo).then(
+ response => {
+ $scope.isSpinnerVisible = false;
+ vm.saveReportData(response);
+ }, response => {
+ $scope.isSpinnerVisible = false;
+ vm.printReportFail(response);
+ });
+ };
+
+ vm.saveReportData = function(response) {
+ vm.report =
+ "Selected test API: \n" + DataService.getMsoRequestParametersTestApi()
+ + "\n\n Data from GUI:\n" + errorMsg
+ + "\n\n Collected data from API:\n" + JSON.stringify(response.data, null, "\t") ;
+
+ const blob = new Blob([ vm.report ], { type : 'text/plain' });
+ vm.download = ($window.URL || $window.webkitURL).createObjectURL( blob );
+ vm.downloadEnable = true;
+ };
+
+ vm.printReportFail = function(response) {
+ vm.downloadEnable = false;
+ vm.report = errorMsg + "\n\n API error:\n" + JSON.stringify(response.data, null, "\t") ;
+ };
+
+
+ vm.close = function () {
+ $uibModalInstance.close();
+ };
+
+ vm.ok = function () {
+ $uibModalInstance.close(true);
+ };
+
+ init();
+ }
+})();
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.test.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.test.js
new file mode 100644
index 000000000..b62d5e117
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal-request.controller.test.js
@@ -0,0 +1,119 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+require('./report-modal-request.controller');
+const jestMock = require('jest-mock');
+
+describe('Testing error report creation', () => {
+ const mockAPI = "testAPI";
+
+ let $notNeeded;
+ let $controller;
+
+ let mockHttp;
+
+ let mockModalInstance;
+ let mockWindow;
+ let mockReportService;
+ let testErrorMsg;
+ let mockDataService;
+
+ let correctResponse;
+ let failResponse;
+
+ let mockInfo;
+
+ beforeEach(
+ angular.mock.module('app')
+ );
+
+ beforeEach(inject(function (_$controller_) {
+ $notNeeded = jestMock.fn();
+ mockHttp = jestMock.fn();
+ mockDataService = jestMock.fn();
+
+ mockDataService.getMsoRequestParametersTestApi = function() {
+ return mockAPI;
+ };
+
+ mockModalInstance = {};
+ mockWindow = {
+ webkitURL: {
+ createObjectURL: function (blob) {
+ return blob;
+ }
+ }
+ };
+
+ correctResponse = {data:{report:"test-error-report",status:202}};
+ failResponse = {data:{report:"test-fail-report",status:404}};
+
+ mockReportService = {
+
+ getReportData: function(info) {
+ return Promise.resolve(correctResponse);
+ },
+ getReportTimeStamp: function () {
+ return "testTime";
+ }
+ };
+
+ testErrorMsg = 'testing message';
+
+ $controller = _$controller_('reportModalInstanceController',{
+ $uibModalInstance: mockModalInstance,
+ $scope: $notNeeded,
+ $window: mockWindow,
+ ReportService: mockReportService,
+ DataService: mockDataService,
+ errorMsg: testErrorMsg,
+ requestInfo: mockInfo
+ });
+ }));
+
+ test('Verify close will call close in modal instance', () => {
+ mockModalInstance.close = jestMock.fn();
+
+ $controller.close();
+
+ expect(mockModalInstance.close).toHaveBeenCalled();
+ });
+
+ test('Verify report was constructed properly', () => {
+
+ $controller.saveReportData(correctResponse);
+
+ expect($controller.report).toEqual(
+ "Selected test API: \n" + mockAPI
+ + "\n\n Data from GUI:\n" + testErrorMsg
+ + "\n\n Collected data from API:\n" + JSON.stringify(correctResponse.data, null, "\t"));
+ expect($controller.downloadEnable).toBeTruthy();
+ expect($controller.download).toEqual(new Blob([ $controller.report ], { type : 'text/plain' }));
+ });
+
+ test('Verify report contains error if API did not respond', () => {
+
+ $controller.printReportFail(failResponse);
+
+ expect($controller.report).toEqual(testErrorMsg + "\n\n API error:\n" + JSON.stringify(failResponse.data, null, "\t"));
+ expect($controller.downloadEnable).toBeFalsy();
+ });
+
+});
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.js
new file mode 100644
index 000000000..eff029175
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.js
@@ -0,0 +1,71 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+(function () {
+ 'use strict';
+
+ appDS2.controller("reportModalController", ["$uibModalInstance", "$scope", "$window", "DataService", "ReportService", "errorMsg", reportModalController]);
+
+ function reportModalController($uibModalInstance, $scope, $window, DataService, ReportService, errorMsg) {
+ const vm = this;
+
+ const init = function() {
+ vm.timestamp = ReportService.getReportTimeStamp();
+ vm.downloadEnable = false;
+ $scope.isSpinnerVisible = true;
+
+ ReportService.getReportData({}).then(
+ response => {
+ $scope.isSpinnerVisible = false;
+ vm.saveReportData(response);
+ }, response => {
+ $scope.isSpinnerVisible = false;
+ vm.printReportFail(response);
+ });
+ };
+
+ vm.saveReportData = function(response) {
+ vm.report =
+ "Selected test API: \n" + DataService.getMsoRequestParametersTestApi()
+ + "\n\n Data from GUI:\n" + errorMsg
+ + "\n\n Collected data from API:\n" + JSON.stringify(response.data, null, "\t") ;
+
+
+ const blob = new Blob([ vm.report ], { type : 'text/plain' });
+ vm.download = ($window.URL || $window.webkitURL).createObjectURL( blob );
+ vm.downloadEnable = true;
+ };
+
+ vm.printReportFail = function(response) {
+ vm.downloadEnable = false;
+ vm.report = errorMsg + "\n\n API error:\n" + JSON.stringify(response.data, null, "\t") ;
+ };
+
+ vm.close = function () {
+ $uibModalInstance.close();
+ };
+
+ vm.ok = function () {
+ $uibModalInstance.close(true);
+ };
+
+ init();
+ }
+})();
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.test.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.test.js
new file mode 100644
index 000000000..65a12a935
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.controller.test.js
@@ -0,0 +1,117 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+require('./report-modal.controller');
+const jestMock = require('jest-mock');
+
+describe('Testing error report creation', () => {
+ const mockAPI = "testAPI";
+
+ let $notNeeded;
+ let $controller;
+
+ let mockHttp;
+
+ let mockModalInstance;
+ let mockWindow;
+ let mockReportService;
+ let testErrorMsg;
+ let mockDataService;
+
+ let correctResponse;
+ let failResponse;
+
+ beforeEach(
+ angular.mock.module('app')
+ );
+
+ beforeEach(inject(function (_$controller_) {
+ $notNeeded = jestMock.fn();
+ mockHttp = jestMock.fn();
+ mockDataService = jestMock.fn();
+
+ mockDataService.getMsoRequestParametersTestApi = function() {
+ return mockAPI;
+ };
+
+ mockModalInstance = {};
+ mockWindow = {
+ webkitURL: {
+ createObjectURL: function (blob) {
+ return blob;
+ }
+ }
+ };
+
+ correctResponse = {data:{report:"test-error-report",status:202}};
+ failResponse = {data:{report:"test-fail-report",status:404}};
+
+ mockReportService = {
+
+ getReportData: function() {
+ return Promise.resolve(correctResponse);
+ },
+ getReportTimeStamp: function () {
+ return "testTime";
+ }
+ };
+
+ testErrorMsg = 'testing message';
+
+ $controller = _$controller_('reportModalController',{
+ $uibModalInstance: mockModalInstance,
+ $scope: $notNeeded,
+ $window: mockWindow,
+ ReportService: mockReportService,
+ errorMsg: testErrorMsg,
+ DataService: mockDataService
+ });
+ }));
+
+ test('Verify close will call close in modal instance', () => {
+ mockModalInstance.close = jestMock.fn();
+
+ $controller.close();
+
+ expect(mockModalInstance.close).toHaveBeenCalled();
+ });
+
+ test('Verify report was constructed properly', () => {
+
+ $controller.saveReportData(correctResponse);
+
+ expect($controller.report).toEqual(
+ "Selected test API: \n" + mockAPI
+ + "\n\n Data from GUI:\n" + testErrorMsg
+ + "\n\n Collected data from API:\n" + JSON.stringify(correctResponse.data, null, "\t"));
+
+ expect($controller.downloadEnable).toBeTruthy();
+ expect($controller.download).toEqual(new Blob([ $controller.report ], { type : 'text/plain' }));
+ });
+
+ test('Verify report contains error if API did not respond', () => {
+
+ $controller.printReportFail(failResponse);
+
+ expect($controller.report).toEqual(testErrorMsg + "\n\n API error:\n" + JSON.stringify(failResponse.data, null, "\t"));
+ expect($controller.downloadEnable).toBeFalsy();
+ });
+
+});
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.css b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.css
new file mode 100644
index 000000000..77b935413
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.css
@@ -0,0 +1,4 @@
+.download-button{
+ text-decoration: none !important;
+ text-underline: none;
+} \ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.html
new file mode 100644
index 000000000..c725222c6
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/report-modal/report-modal.html
@@ -0,0 +1,39 @@
+<!--
+ ============LICENSE_START=======================================================
+ VID
+ ================================================================================
+ Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ ================================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ============LICENSE_END=========================================================
+ -->
+
+<link rel="stylesheet" type="text/css" href="app/vid/styles/serviceModels.css" />
+<link rel="stylesheet" type="text/css" href="app/vid/styles/modals.css">
+<link rel="stylesheet" type="text/css" href="app/vid/styles/modal-create-new.css" />
+<link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/report-modal/report-modal.css" />
+
+<div class="modal-header">
+ <h3 id="modal-title">Error report</h3>
+ <span class="statusLine" ng-hide="!isSpinnerVisible">
+ <img src="app/vid/images/spinner.gif">
+ </span>
+</div>
+<div class="modal-body">
+ <textarea style="height: 500px">{{vm.report}}</textarea>
+</div>
+<div class="modal-footer">
+ <a ngx-enabled="{{vm.downloadEnable}}" att-button download="VID_fault_report_{{vm.timestamp}}.txt" ng-href="{{vm.download}}" btn-type="primary" size="small" class="download-button" >Download report</a>
+ <button type="button" data-tests-id="cancelButton" ng-click="vm.close();" att-button
+ btn-type="primary" size="small" >Close</button>
+</div>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/reportService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/reportService.js
new file mode 100644
index 000000000..0b401dcb2
--- /dev/null
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/reportService.js
@@ -0,0 +1,27 @@
+"use strict";
+
+var ReportService = function ( $http ) {
+
+ return {
+
+ getReportData: function(requestInfo) {
+ return $http.post("error-report",requestInfo);
+ },
+
+ getReportTimeStamp: function () {
+ const today = new Date();
+ const se = String(today.getSeconds()).padStart(2, '0');
+ const mi = String(today.getMinutes()).padStart(2, '0');
+ const hr = String(today.getHours()).padStart(2, '0');
+ const dd = String(today.getDate()).padStart(2, '0');
+ const mm = String(today.getMonth() + 1).padStart(2, '0');
+ const yyyy = today.getFullYear();
+
+ return hr + '-' + mi + '-' + se + "_" + dd + '-' + mm + '-' + yyyy;
+ }
+
+ }
+
+};
+
+appDS2.factory("ReportService", ["$http", ReportService]); \ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm
index 3597e57b5..ba9960f0b 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubs.htm
@@ -29,7 +29,8 @@
<label>Status:</label><span class="status">{{status}}</span>
</div>
- <div ng-if="errorMsg != null"><font color='red'>{{errorMsg}}
+ <div ng-if="errorMsg != null"><font color='red'>{{errorMsg}}<br/>
+ <button class="btn btn-danger" ng-click="showReportWindow()" ng-if="isShowErrorReport()">create report</button>
<pre>{{errorDetails | json}}</pre>
</font></div>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubscriberList.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubscriberList.htm
index 2d04067f1..7081fdba0 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubscriberList.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiGetSubscriberList.htm
@@ -29,7 +29,8 @@
<label>Status:</label><span class="status">{{status}}</span>
</div>
- <div ng-if="errorMsg != null"><font color='red'>{{errorMsg}}
+ <div ng-if="errorMsg != null"><font color='red'>{{errorMsg}}<br/>
+ <button class="btn btn-danger" ng-click="showReportWindow()" ng-if="isShowErrorReport()">create report</button>
<pre>{{errorDetails | json}}</pre>
</font></div>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiServiceTypes.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiServiceTypes.htm
index cc69fb580..68aaec50e 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiServiceTypes.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiServiceTypes.htm
@@ -28,7 +28,11 @@
<img src="app/vid/images/spinner.gif"></img>
<label>Status:</label><span class="status">{{status}}</span>
</div>
- <div ng-if="errorMsg != null"><font color='red'>{{errorMsg}}<pre>{{errorDetails | json}}</pre></font></div>
+ <div ng-if="errorMsg != null">
+ <font color='red'>{{errorMsg}}<br/>
+ <button class="btn btn-danger" ng-click="showReportWindow()" ng-if="isShowErrorReport()">Create report</button>
+ <pre>{{errorDetails | json}}</pre></font>
+ </div>
<h2 class="heading2"><center>Create New Service Instance</center></h2>
<table class="create-instance-service ">
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm
index 6c2dfc67a..4b9f8b03c 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubDetails.htm
@@ -27,7 +27,10 @@
<label>Status:</label><span class="status">{{status}}</span>
</div>
- <div data-tests-id="subDetailsErrMsg" ng-if="errorMsg != null"><font color='red'>{{errorMsg}}<pre>{{errorDetails | json}}</pre></font></div>
+ <div data-tests-id="subDetailsErrMsg" ng-if="errorMsg != null">
+ <font color='red'>{{errorMsg}}<pre>{{errorDetails | json}}</pre></font>
+ <button class="btn btn-danger" ng-click="showReportWindow()" ng-if="isShowErrorReport()">Create report</button>
+ </div>
<h1 class="heading1"><center>Subscriber Details for {{selectedSubscriberId}} ({{selectedSubscriberName}})</center></h1>
<br>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm
index 158c831e7..0e0bb94c7 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/aaiSubViewEdit.htm
@@ -27,6 +27,13 @@
<div ng-include="'app/vid/scripts/view-models/detailsDialog.htm'"></div>
</div>
+ <div ng-if="errorMsg != null">
+ <font color='red'>{{errorMsg}}<br/>
+ <button class="btn btn-danger" ng-click="showReportWindow()" ng-if="isShowErrorReport()">Create report</button>
+ <pre>{{errorDetails | json}}</pre>
+ </font>
+ </div>
+
<div>
<div class="statusLine">
<img src="app/vid/images/spinner.gif"
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
index 819f79d97..4aa37c9db 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/createInstanceServiceModels.htm
@@ -33,7 +33,12 @@
<img src="app/vid/images/spinner.gif"></img>
</span>
<span class="statusLine" ng-class="{true:'progVisible', false:'progHidden'}[isProgressVisible]">
- <label>Status:</label><span class="status"><span ng-show="error"><font color='red'><b>Error: </b></font></span>{{status}}</span>
+ <label>Status:</label><span class="status">
+ <span ng-show="error"><font color='red'><b>Error: </b></font>{{status}}<br/>
+ <button class="btn btn-danger" ng-click="showReportWindow()" ng-if="isShowErrorReport()">Create report</button>
+ </span>
+ </span>
+
</span>
<br><br>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
index 75f6b68af..49d3ef868 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
@@ -33,9 +33,11 @@
</div>
<div class="buttonRow">
<button data-tests-id="confirmButton" ngx-enabled="{{isConfirmEnabled}}" att-button size="small"
- ng-click="confirm();">Confirm</button>
+ ng-click="confirm();">Confirm</button>
<button type="button" data-tests-id="cancelButton" ng-click="cancel();" att-button
- btn-type="primary" size="small">Cancel</button>
+ btn-type="primary" size="small">Cancel</button>
+ <button class="btn-danger" ng-if="isShowErrorReport() && isServiceError" att-button size="small"
+ ng-click="showReportWindow()">Create report</button>
</div>
</div>
</div>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm
index 14851f9e2..10179243e 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm
@@ -43,6 +43,8 @@
<div class="buttonRow">
<button data-tests-id="msoCommitDialogCloseButton" ngx-enabled="{{isCloseEnabled}}" att-button size="small"
ng-click="close();">Close</button>
+ <button class="btn-danger" att-button size="small" ng-show="!isProgressVisible"
+ ng-click="showReportWindow()">Create report</button>
</div>
</div>
-</div>
+</div> \ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
index 06cccfcd9..4570a0b08 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
@@ -30,7 +30,9 @@
<img src="app/vid/images/spinner.gif"></img>
</span>
<span class="statusLine" ng-class="{true:'progVisible', false:'progHidden'}[isProgressVisible]">
- <label>Status:</label><span class="status"><span ng-show="error"><font color='red'><b>Error: </b></font></span>{{status}}</span>
+ <label>Status:</label><span class="status"><span ng-show="error"><font color='red'><b>Error: </b></font></span>{{status}} <br/>
+ <button ng-show="error" class="btn btn-danger" ng-click="showReportWindow()" ng-if="isShowErrorReport()">create report</button>
+ </span>
</span>
<br><br>
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/ErrorReportControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/ErrorReportControllerTest.java
new file mode 100644
index 000000000..1f52f5a00
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/controller/ErrorReportControllerTest.java
@@ -0,0 +1,115 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.vid.controller;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.vid.model.errorReport.ReportCreationParameters;
+import org.onap.vid.reports.BasicReportGenerator;
+import org.onap.vid.reports.DeploymentReportGenerator;
+
+import javax.servlet.http.HttpServletRequest;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ErrorReportControllerTest {
+
+ private BasicReportGenerator basicReportGenerator;
+ private DeploymentReportGenerator deploymentReportGenerator;
+ private HttpServletRequest httpServletRequest;
+
+ private ErrorReportController errorReportController;
+
+ @Before
+ public void setUp() {
+ basicReportGenerator = mock(BasicReportGenerator.class);
+ deploymentReportGenerator = mock(DeploymentReportGenerator.class);
+ httpServletRequest = mock(HttpServletRequest.class);
+
+ errorReportController
+ = new ErrorReportController(Arrays.asList(basicReportGenerator, deploymentReportGenerator));
+ }
+
+ @Test
+ public void shouldGenerateBasicReportDataWhenNoParameters() {
+ //given
+ ReportCreationParameters parameters = new ReportCreationParameters();
+
+ ImmutableMap<String, Object> expectedReport = ImmutableMap.<String, Object>builder()
+ .put("X-ECOMP-RequestID", "request_id")
+ .put("X-ECOMP-RequestID1", "request_id1")
+ .put("X-ECOMP-RequestID2", "request_id2")
+ .put("X-ECOMP-RequestID3", "request_id3")
+ .build();
+
+ when(basicReportGenerator.apply(httpServletRequest, parameters)).thenReturn(expectedReport);
+ when(basicReportGenerator.canGenerate(parameters)).thenReturn(true);
+ when(deploymentReportGenerator.canGenerate(parameters)).thenReturn(false);
+
+ //when
+ Map<String, Object> actualReport = errorReportController.generateReportsData(httpServletRequest, parameters);
+
+ //then
+ assertThat(actualReport).isEqualTo(expectedReport);
+ }
+
+ @Test
+ public void shouldGenerateDeploymentReportDataWhenSpecificParameters() {
+ //given
+ ReportCreationParameters parameters =
+ new ReportCreationParameters("request_id", "service_uuid");
+
+ ImmutableMap<String, Object> basicReport = ImmutableMap.<String, Object>builder()
+ .put("X-ECOMP-RequestID", "request_id")
+ .put("X-ECOMP-RequestID1", "request_id1")
+ .build();
+
+ ImmutableMap<String, Object> extendedReport = ImmutableMap.<String, Object>builder()
+ .put("serviceInstanceInfo", "serviceInstanceInfoVal")
+ .put("serviceInstanceInfo1", "serviceInstanceInfoVal1")
+ .build();
+
+ HashMap<String, Object> expectedReport = new HashMap<>(basicReport);
+ expectedReport.putAll(extendedReport);
+
+ when(basicReportGenerator.apply(httpServletRequest, parameters)).thenReturn(basicReport);
+ when(deploymentReportGenerator.apply(httpServletRequest, parameters)).thenReturn(extendedReport);
+ when(basicReportGenerator.canGenerate(parameters)).thenReturn(true);
+ when(deploymentReportGenerator.canGenerate(parameters)).thenReturn(true);
+
+ //when
+ Map<String, Object> actualReport = errorReportController.generateReportsData(httpServletRequest, parameters);
+
+ //then
+ assertThat(actualReport).isEqualTo(expectedReport);
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/onap/vid/reports/BasicReportGeneratorTest.java b/vid-app-common/src/test/java/org/onap/vid/reports/BasicReportGeneratorTest.java
new file mode 100644
index 000000000..d34646dcb
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/reports/BasicReportGeneratorTest.java
@@ -0,0 +1,165 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.vid.reports;
+
+import com.google.common.collect.ImmutableMap;
+import io.joshworks.restclient.http.Headers;
+import io.joshworks.restclient.http.HttpResponse;
+import io.joshworks.restclient.http.exceptions.RestClientException;
+import nu.xom.jaxen.util.SingletonList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.util.SystemProperties;
+import org.onap.vid.aai.AaiClient;
+import org.onap.vid.model.SubscriberList;
+import org.onap.vid.model.errorReport.ReportCreationParameters;
+import org.onap.vid.model.probes.ExternalComponentStatus;
+import org.onap.vid.model.probes.StatusMetadata;
+import org.onap.vid.roles.RoleProvider;
+import org.onap.vid.scheduler.SchedulerService;
+import org.onap.vid.services.AaiService;
+import org.onap.vid.services.ProbeService;
+import org.onap.vid.utils.SystemPropertiesWrapper;
+import org.springframework.http.HttpStatus;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BasicReportGeneratorTest {
+
+ private static final String USER_ATTRIBUTE = "userAttribute";
+ private ReportCreationParameters creationParameters = new ReportCreationParameters();
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private HttpServletRequest request;
+ @Mock
+ private HttpResponse<SubscriberList> subscriberListResponse;
+ @Mock
+ private ProbeService probeService;
+
+ @Mock
+ private AaiClient aaiClient;
+ @Mock
+ private SchedulerService schedulerService;
+ @Mock
+ private AaiService aaiService;
+ @Mock
+ private RoleProvider roleProvider;
+ @Mock
+ private SystemPropertiesWrapper systemPropertiesWrapper;
+
+ @InjectMocks
+ private BasicReportGenerator basicReportGenerator;
+
+ @Test
+ public void shouldAlwaysReturnTrueAsConditionOfGeneration() {
+ //given
+ //when
+ //then
+ assertThat(basicReportGenerator.canGenerate(creationParameters)).isTrue();
+ }
+
+ @Test
+ public void shouldGetUserIDFromSystemProperties() {
+ //given
+ final String expectedUserID = "user_id";
+ User user = new User();
+ user.setLoginId(expectedUserID);
+
+ when(systemPropertiesWrapper.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn(USER_ATTRIBUTE);
+ when(request.getSession().getAttribute(USER_ATTRIBUTE)).thenReturn(user);
+
+ //when
+ String actualUserID = basicReportGenerator.getUserIDFromSystemProperties(request);
+
+ //then
+ assertThat(actualUserID).isEqualTo(expectedUserID);
+ }
+
+ @Test
+ public void shouldGetProbes() {
+ //given
+ ExternalComponentStatus status = new ExternalComponentStatus(
+ ExternalComponentStatus.Component.MSO,
+ true,
+ mock(StatusMetadata.class));
+ List<ExternalComponentStatus> expectedProbes = Collections.singletonList(status);
+
+ when(probeService.getProbe()).thenReturn(expectedProbes);
+
+ //when
+ List<ExternalComponentStatus> actualProbes = basicReportGenerator.getProbe();
+
+ //then
+ assertThat(actualProbes).isEqualTo(expectedProbes);
+ }
+
+ @Test
+ public void shouldGetFullSubscriberList() {
+ //given
+ SubscriberList subscriberList = new SubscriberList();
+ Headers headers = new Headers();
+ int status = HttpStatus.OK.value();
+
+ ImmutableMap<String, Object> expectedSubscriberList = ImmutableMap.<String, Object>builder()
+ .put("status", status)
+ .put("body", subscriberList)
+ .put("headers", headers)
+ .build();
+
+ when(aaiService.getFullSubscriberList()).thenReturn(subscriberListResponse);
+ when(subscriberListResponse.getStatus()).thenReturn(status);
+ when(subscriberListResponse.getBody()).thenReturn(subscriberList);
+ when(subscriberListResponse.getHeaders()).thenReturn(headers);
+
+ //when
+ ImmutableMap<String, Object> actualSubscriberList = basicReportGenerator.getFullSubscriberList();
+
+ //then
+ assertThat(actualSubscriberList).isEqualTo(expectedSubscriberList);
+ }
+
+ @Test
+ public void shouldReturnExceptionInfoWhileGettingFullSubscriberList() {
+ //given
+ RestClientException expectedException = mock(RestClientException.class);
+ ImmutableMap<String, Object> expectedResult = ImmutableMap.of("exception", expectedException.toString());
+
+ when(aaiService.getFullSubscriberList()).thenThrow(expectedException);
+
+ //when
+ ImmutableMap<String, Object> actualResult = basicReportGenerator.getFullSubscriberList();
+
+ //then
+ assertThat(actualResult).isEqualTo(expectedResult);
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/onap/vid/reports/DeploymentReportGeneratorTest.java b/vid-app-common/src/test/java/org/onap/vid/reports/DeploymentReportGeneratorTest.java
new file mode 100644
index 000000000..fa6e832db
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/reports/DeploymentReportGeneratorTest.java
@@ -0,0 +1,120 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.vid.reports;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.vid.asdc.AsdcCatalogException;
+import org.onap.vid.model.Service;
+import org.onap.vid.model.ServiceModel;
+import org.onap.vid.model.errorReport.ReportCreationParameters;
+import org.onap.vid.mso.MsoBusinessLogic;
+import org.onap.vid.mso.MsoResponseWrapper;
+import org.onap.vid.services.VidService;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DeploymentReportGeneratorTest {
+
+ @Mock
+ private MsoBusinessLogic msoBusinessLogic;
+ @Mock
+ private VidService vidService;
+
+ @InjectMocks
+ private DeploymentReportGenerator deploymentReportGenerator;
+
+ @Test
+ public void shouldReturnTrueIfConditionsOfGenerationAreFulfilled() {
+ //given
+ ReportCreationParameters parameters = new ReportCreationParameters();
+ parameters.setRequestId("request_id");
+ parameters.setServiceUuid("service_uuid");
+
+ //when
+ boolean actualResult = deploymentReportGenerator.canGenerate(parameters);
+
+ //then
+ assertThat(actualResult).isTrue();
+ }
+
+ @Test
+ public void shouldGetOrchestrationRequestFromMso() {
+ //given
+ final String requestId = "request_id";
+ MsoResponseWrapper expectedOrchestrationRequest = mock(MsoResponseWrapper.class);
+
+ when(msoBusinessLogic.getOrchestrationRequest(requestId)).thenReturn(expectedOrchestrationRequest);
+
+ //when
+ MsoResponseWrapper actualOrchestrationRequest =
+ deploymentReportGenerator.getOrchestrationRequestFromMso(requestId);
+
+ //then
+ assertThat(actualOrchestrationRequest).isEqualTo(expectedOrchestrationRequest);
+ }
+
+ @Test
+ public void shouldGetServiceDetails() throws AsdcCatalogException {
+ //given
+ final String SERVICE_UUID = "service_uuid";
+ ServiceModel serviceModel = mock(ServiceModel.class);
+ Service expectedService = new Service();
+ ImmutableMap<String, Object> expectedServiceDetails = ImmutableMap.of("details", expectedService);
+
+ when(vidService.getService(SERVICE_UUID)).thenReturn(serviceModel);
+ when(serviceModel.getService()).thenReturn(expectedService);
+
+ //when
+ Map<String, Object> actualServiceDetails = deploymentReportGenerator.getServiceDetails(SERVICE_UUID);
+
+ //then
+ assertThat(actualServiceDetails).isEqualTo(expectedServiceDetails);
+ }
+
+ @Test
+ public void shouldGetNullPointerExceptionInfoInMapWhenWrongUuidIsGiven() {
+ //given
+ final String NOT_EXISTING_UUID = "8ad001d0-1111-2222-3333-123412341234";
+ NullPointerException expectedException = new NullPointerException("msg");
+
+ Map<String, Object> expectedResult = ImmutableMap.<String, Object>builder()
+ .put("message", "Service details for given uuid were not found")
+ .put("exception", expectedException.toString())
+ .put("serviceUuid", NOT_EXISTING_UUID)
+ .build();
+
+ //when
+ Map<String, Object> actualResult =
+ deploymentReportGenerator.generateServiceDetailsExceptionResponse(NOT_EXISTING_UUID, expectedException);
+
+ //then
+ assertThat(actualResult).isEqualTo(expectedResult);
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/java/org/onap/vid/services/ProbeServiceTest.java b/vid-app-common/src/test/java/org/onap/vid/services/ProbeServiceTest.java
new file mode 100644
index 000000000..39b2df3d1
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/services/ProbeServiceTest.java
@@ -0,0 +1,96 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.vid.services;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.vid.aai.AaiClient;
+import org.onap.vid.aai.AaiOverTLSClient;
+import org.onap.vid.model.probes.ExternalComponentStatus;
+import org.onap.vid.model.probes.StatusMetadata;
+import org.onap.vid.mso.MsoBusinessLogic;
+import org.onap.vid.scheduler.SchedulerService;
+
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ProbeServiceTest {
+
+ private AaiClient aaiClient;
+ private AaiOverTLSClient newAaiClient;
+ private SchedulerService schedulerService;
+ private MsoBusinessLogic msoBusinessLogic;
+ private VidService vidService;
+ private List<ProbeInterface> probeInterfaces;
+ private ProbeService probeService;
+
+ @Before
+ public void setUp() throws Exception {
+ aaiClient = mock(AaiClient.class);
+ newAaiClient = mock(AaiOverTLSClient.class);
+ schedulerService = mock(SchedulerService.class);
+ msoBusinessLogic = mock(MsoBusinessLogic.class);
+ vidService = mock(VidService.class);
+
+ probeInterfaces = Arrays.asList(aaiClient, newAaiClient, schedulerService, msoBusinessLogic, vidService);
+ probeService = new ProbeService(probeInterfaces);
+ }
+
+ @Test
+ public void shouldGetProbes() {
+ //given
+ StatusMetadata statusMetadata = mock(StatusMetadata.class);
+
+ ExternalComponentStatus statusAai =
+ new ExternalComponentStatus(ExternalComponentStatus.Component.AAI, true, statusMetadata);
+ ExternalComponentStatus statusScheduler =
+ new ExternalComponentStatus(ExternalComponentStatus.Component.SCHEDULER, false, statusMetadata);
+ ExternalComponentStatus statusMso =
+ new ExternalComponentStatus(ExternalComponentStatus.Component.MSO, true, statusMetadata);
+ ExternalComponentStatus statusSdc =
+ new ExternalComponentStatus(ExternalComponentStatus.Component.SDC, false, statusMetadata);
+
+ List<ExternalComponentStatus> expectedStatuses =
+ Arrays.asList(statusAai, statusAai, statusScheduler, statusMso, statusSdc);
+
+ when(aaiClient.probeComponent()).thenReturn(statusAai);
+ when(newAaiClient.probeComponent()).thenReturn(statusAai);
+ when(schedulerService.probeComponent()).thenReturn(statusScheduler);
+ when(msoBusinessLogic.probeComponent()).thenReturn(statusMso);
+ when(vidService.probeComponent()).thenReturn(statusSdc);
+
+ //when
+ List<ExternalComponentStatus> actualStatuses = probeService.getProbe();
+
+ //then
+ assertThat(actualStatuses).isEqualTo(expectedStatuses);
+ }
+} \ No newline at end of file
diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml
index 246402682..685e2b24a 100644
--- a/vid-automation/pom.xml
+++ b/vid-automation/pom.xml
@@ -6,7 +6,7 @@
<artifactId>automationTest</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
- <springframework.version>4.3.22.RELEASE</springframework.version>
+ <springframework.version>5.1.6.RELEASE</springframework.version>
<jersey.version>2.27</jersey.version>
<jackson.version>2.9.7</jackson.version>
<aspectj.version>1.8.10</aspectj.version>
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index 56404f876..59f886826 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -13,8 +13,9 @@
<properties>
<encoding>UTF-8</encoding>
<epsdk.version>1.3.0</epsdk.version>
- <springframework.version>4.3.22.RELEASE</springframework.version>
+ <springframework.version>5.1.6.RELEASE</springframework.version>
<hibernate.version>5.3.4.Final</hibernate.version>
+ <jackson.version>2.9.8</jackson.version>
<!-- Skip assembling the zip by default -->
<skipassembly>true</skipassembly>
<!-- Tests usually require some setup that maven cannot do, so skip. -->
@@ -132,8 +133,18 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.8.7</version>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
diff --git a/vid-webpack-master/pom.xml b/vid-webpack-master/pom.xml
index 184f3c99d..38c0f7f0c 100644
--- a/vid-webpack-master/pom.xml
+++ b/vid-webpack-master/pom.xml
@@ -16,7 +16,7 @@
<properties>
<encoding>UTF-8</encoding>
- <!--<springframework.version>4.2.0.RELEASE</springframework.version>-->
+ <!--<springframework.version>5.1.6.RELEASE</springframework.version>-->
<!--<hibernate.version>4.3.11.Final</hibernate.version>-->
<!--<jackson.version>2.6.3</jackson.version>-->
<!-- Skip assembling the zip by default -->