diff options
| -rwxr-xr-x | epsdk-app-onap/pom.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rwxr-xr-x | vid-app-common/pom.xml | 2 | ||||
| -rw-r--r-- | vid-automation/pom.xml | 2 | ||||
| -rw-r--r-- | vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java | 5 | ||||
| -rw-r--r-- | vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts | 3 | ||||
| -rw-r--r-- | vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.ts | 4 | ||||
| -rw-r--r-- | vid-webpack-master/src/app/shared/models/serviceBase.ts | 8 |
8 files changed, 16 insertions, 12 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index 0dc8eacea..95c1ce271 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <relativePath/> </parent> @@ -10,7 +10,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <relativePath/> </parent> diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index f618ec822..c9356771d 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <relativePath/> </parent> diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml index e2ef865f4..34abd22f5 100644 --- a/vid-automation/pom.xml +++ b/vid-automation/pom.xml @@ -167,7 +167,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.3</version> + <version>1.9.4</version> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java index b65e797b8..9651002b2 100644 --- a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java +++ b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java @@ -64,9 +64,10 @@ public class LoggerFormatTest extends BaseApiTest { @DataProvider public static Object[][] logsAndFormats(Method test) { return new Object[][]{ - {LogName.debug, "debug", 0.65 }, + {LogName.debug, "debug", 0.95 }, {LogName.metrics2019, "metric-ELS-2019.11", 0.95}, - {LogName.audit2019, "audit-ELS-2019.11", 0.95} + {LogName.audit2019, "audit-ELS-2019.11", 0.95}, + {LogName.error, "error", 0.75 } }; } diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts index c510391cb..342818a71 100644 --- a/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts @@ -7,7 +7,7 @@ import {AsyncInstantiationModel} from '../../support/jsonBuilders/models/asyncIn describe('Instantiation status', function () { var jsonBuilderInstantiationBuilder : JsonBuilder<AsyncInstantiationModel> = new JsonBuilder<AsyncInstantiationModel>(); var asyncRes: Array<any>; - const contextMenuCreateAnotherOne = 'context-menu-recreate'; + const contextMenuCreateAnotherOne = 'context-menu-create-another-one'; beforeEach(() => { cy.clearSessionStorage(); @@ -126,6 +126,7 @@ describe('Instantiation status', function () { cy.openIframe('app/ui/#/instantiationStatus'); clickOnTitleAndThenOnMenuWithJobId(jobId); + cy.get('.dropdown-menu').getElementByDataTestsId(contextMenuCreateAnotherOne).contains('Create another one'); cy.get('.dropdown-menu').getElementByDataTestsId(contextMenuCreateAnotherOne).click(); cy.location().should((loc) => { expect(loc.toString()).to.eq(`${vidBaseUrl}#/servicePlanning/RECREATE?serviceModelId=${serviceModelId}&jobId=${jobId}`); diff --git a/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.ts b/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.ts index 58227c9eb..4f84b7125 100644 --- a/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.ts +++ b/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.ts @@ -59,8 +59,8 @@ export class InstantiationStatusComponent implements OnInit { visible: () => true, }, { - name: "Recreate", - dataTestId: "context-menu-recreate", + name: "Create another one", + dataTestId: "context-menu-create-another-one", className: "fa-clone", click: (item: ServiceInfoModel) => this.instantiationStatusComponentService.recreate(item), enabled: (item: ServiceInfoModel) => this.instantiationStatusComponentService.isRecreateEnabled(item), diff --git a/vid-webpack-master/src/app/shared/models/serviceBase.ts b/vid-webpack-master/src/app/shared/models/serviceBase.ts index b6dec0fbb..afa8a8136 100644 --- a/vid-webpack-master/src/app/shared/models/serviceBase.ts +++ b/vid-webpack-master/src/app/shared/models/serviceBase.ts @@ -2,8 +2,10 @@ export class InstantiationBase { readonly jobId: string; readonly serviceModelId: string; - constructor(data) { - this.jobId = data.jobId; - this.serviceModelId = data.serviceModelId; + constructor(data?) { + if(data){ + this.jobId = data.jobId; + this.serviceModelId = data.serviceModelId; + } } } |