diff options
Diffstat (limited to 'vid-automation')
16 files changed, 171 insertions, 705 deletions
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java index 8ad111849..2bc664591 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java @@ -1,12 +1,10 @@ package org.onap.simulator.presetGenerator.presets.BasePresets; -import vid.automation.test.infra.Features; +import static org.apache.commons.lang3.StringUtils.isNotEmpty; import java.util.Map; +import vid.automation.test.infra.Features; -/** - * Created by itzikliderman on 27/12/2017. - */ public abstract class BaseMSOPreset extends BasePreset { public static final String DEFAULT_CLOUD_OWNER = "irma-aic"; @@ -31,14 +29,14 @@ public abstract class BaseMSOPreset extends BasePreset { protected String addCloudOwnerIfNeeded() { return Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST.isActive() ? - "\"cloudOwner\": \""+cloudOwner+"\"," : ""; + "\"cloudOwner\": \"" + cloudOwner + "\"," : ""; } protected String addPlatformIfNeeded(String platform) { - return platform != "" ? - " \"platform\": {" + - " \"platformName\": \""+platform+"\"," + - "}," : ""; + return isNotEmpty(platform) ? + " \"platform\": {" + + " \"platformName\": \"" + platform + "\"," + + "}," : ""; } @Override @@ -49,7 +47,7 @@ public abstract class BaseMSOPreset extends BasePreset { @Override public Map<String, String> getRequestHeaders() { Map<String, String> map = super.getRequestHeaders(); - map.put("X-ONAP-PartnerName", "VID"); + map.put("X-ONAP-PartnerName", "VID.VID"); return map; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseSDCPreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseSDCPreset.java index d5f8b84cd..ad8dfb3ac 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseSDCPreset.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseSDCPreset.java @@ -1,12 +1,19 @@ package org.onap.simulator.presetGenerator.presets.BasePresets; -/** - * Created by itzikliderman on 27/12/2017. - */ +import java.util.Map; + public abstract class BaseSDCPreset extends BasePreset { @Override protected String getRootPath() { return "/sdc/v1/catalog/services"; } + + @Override + public Map<String, String> getRequestHeaders() { + Map<String, String> map = super.getRequestHeaders(); + map.put("X-ONAP-PartnerName", "VID.VID"); + return map; + } + } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java index 0808eaba6..575a8888e 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java @@ -1,5 +1,6 @@ package org.onap.simulator.presetGenerator.presets.aai; +import org.apache.commons.lang3.StringUtils; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; import org.springframework.http.HttpMethod; @@ -9,21 +10,46 @@ public class PresetAAIGetTenants extends BaseAAIPreset { private final String subscriberId; private final String serviceType; private String responseBody; + private static final String responseBodyResourceDefault = "presets_templates/PresetAAIGetTenants.json"; public PresetAAIGetTenants(String subscriberId, String serviceType, String responseBodyResource) { this.subscriberId = subscriberId; this.serviceType = serviceType; - this.responseBody = loadResourceAsString(responseBodyResource); + this.responseBody = loadResponseBody(responseBodyResource); } public PresetAAIGetTenants() { this( - "e433710f-9217-458d-a79d-1c7aff376d89", - "TYLER SILVIA", - "presets_templates/PresetAAIGetTenants.json" + "e433710f-9217-458d-a79d-1c7aff376d89", + "TYLER SILVIA", + responseBodyResourceDefault ); } + public PresetAAIGetTenants(String subscriberId, String serviceType) { + this( + subscriberId, + serviceType, + responseBodyResourceDefault + ); + } + + private String loadResponseBody(String responseBodyResource) { + + String responseBody = loadResourceAsString(responseBodyResource); + + if (StringUtils.equals(responseBodyResource, responseBodyResourceDefault)) { + responseBody = setServiceTypeInTheResponse(responseBody); + } + + return responseBody; + } + + private String setServiceTypeInTheResponse(String resourceBodyAsString) { + final String serviceTypePlaceHolder = "<service-type>"; + return resourceBodyAsString.replace(serviceTypePlaceHolder, this.serviceType); + } + @Override public Object getResponseBody() { return responseBody; @@ -38,6 +64,4 @@ public class PresetAAIGetTenants extends BaseAAIPreset { public String getReqPath() { return getRootPath() + "/business/customers/customer/" + this.subscriberId + "/service-subscriptions/service-subscription/" + this.serviceType; } - - } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java index 180685282..5ffd24253 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java @@ -208,6 +208,7 @@ public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { " {" + " \"model-version-id\": \"0903e1c0-8e03-4936-b5c2-260653b96413\"," + " \"model-name\": \"action-data\"," + + " \"orchestration-type\": \"a la carte\"," + " \"model-version\": \"1.0\"," + " \"model-description\": \"honor immunity exile prong below misshapen\"," + " \"resource-version\": \"4076846985447\"" + @@ -226,6 +227,7 @@ public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { " {" + " \"model-version-id\": \"666a06ee-4b57-46df-bacf-908da8f10c3f\"," + " \"model-name\": \"multicast-configuration\"," + + " \"orchestration-type\": \"a la carte\"," + " \"model-version\": \"1.0\"," + " \"model-description\": \"python bullwhip appointment computation ambidextrous heaving\"," + " \"resource-version\": \"1500136282691\"" + @@ -244,6 +246,7 @@ public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { " {" + " \"model-version-id\": \"20c4431c-246d-11e7-93ae-92361f002671\"," + " \"model-name\": \"vSAMP10aDEV::base::module-0\"," + + " \"orchestration-type\": \"a la carte\"," + " \"model-version\": \"2\"," + " \"model-description\": \"MSO aLaCarte VF vSAMP10aDEV Base\"," + " \"resource-version\": \"1492627634300\"" + @@ -262,6 +265,7 @@ public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { " {" + " \"model-version-id\": \"797a6c41-0f80-4d35-a288-3920c4e06baa\"," + " \"model-name\": \"CONTRAIL30_L2NODHCP\"," + + " \"orchestration-type\": \"macro\"," + " \"model-version\": \"1.0\"," + " \"model-description\": \"contrail 3.0.x L2 network for AIC 3.x sites (and No DHCP).\"," + " \"resource-version\": \"1492814035003\"," + @@ -307,6 +311,7 @@ public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { " {" + " \"model-version-id\": \"f1bde010-cc5f-4765-941f-75f15b24f9fc\"," + " \"model-name\": \"BkVmxAv061917..base_vPE_AV..module-0\"," + + " \"orchestration-type\": \"macro\"," + " \"model-version\": \"2\"," + " \"resource-version\": \"1497897268769\"," + " \"relationship-list\": {" + @@ -351,6 +356,7 @@ public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { " {" + " \"model-version-id\": \"ipe-resource-id-ps-02\"," + " \"model-name\": \"abc\"," + + " \"orchestration-type\": \"macro\"," + " \"model-version\": \"v1.0\"," + " \"resource-version\": \"1493389520357\"," + " \"relationship-list\": {" + @@ -395,6 +401,7 @@ public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { " {" + " \"model-version-id\": \"lmoser410-connector-model-version-id\"," + " \"model-name\": \"connector\"," + + " \"orchestration-type\": \"macro\"," + " \"model-version\": \"v1.0\"," + " \"resource-version\": \"1493389444766\"" + " }" + diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index 6a15d8961..312c3fd99 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -50,6 +50,7 @@ public enum Features implements Feature { FLAG_PNP_INSTANTIATION, FLAG_HANDLE_SO_WORKFLOWS, FLAG_CREATE_ERROR_REPORTS, + FLAG_SHOW_ORCHESTRATION_TYPE, FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT, FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG, FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH, diff --git a/vid-automation/src/main/java/vid/automation/test/sections/BrowseASDCPage.java b/vid-automation/src/main/java/vid/automation/test/sections/BrowseASDCPage.java index febbe6e83..de69e0047 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/BrowseASDCPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/BrowseASDCPage.java @@ -37,7 +37,7 @@ public class BrowseASDCPage extends VidBasePage { } public int countCurrentRowsInTable(){ - List<WebElement> rowsInTable = Get.byClass("alt-row"); + List<WebElement> rowsInTable = Get.byClass("sdcServiceModel"); return rowsInTable.size(); } diff --git a/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java b/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java index 7290204d6..43dd68f06 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java @@ -4,10 +4,7 @@ import com.aventstack.extentreports.Status; import org.junit.Assert; import org.onap.sdc.ci.tests.execute.setup.ExtentTestActions; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; -import org.openqa.selenium.By; -import org.openqa.selenium.JavascriptExecutor; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; +import org.openqa.selenium.*; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; import vid.automation.test.Constants; @@ -113,6 +110,17 @@ public class VidBasePage { return this; } + public boolean isModelWithGivenServiceUUIDVisible(String serviceUUID) { + String elementTestId = Constants.DEPLOY_BUTTON_TESTS_ID_PREFIX + serviceUUID; + try { + GeneralUIUtils.getWebElementByTestID(elementTestId, 10); + GeneralUIUtils.ultimateWait(); + } catch (TimeoutException te) { + return false; + } + return true; + } + public void screenshotDeployDialog(String serviceUUID) { try { GeneralUIUtils.ultimateWait(); diff --git a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java index f082044fd..eb08c1f2a 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java @@ -31,8 +31,9 @@ import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import static vid.automation.test.infra.Features.FLAG_1908_TRANSPORT_SERVICE_NEW_INSTANTIATION_UI; import static vid.automation.test.infra.Features.FLAG_5G_IN_NEW_INSTANTIATION_UI; +import static vid.automation.test.infra.Features.FLAG_SHOW_ORCHESTRATION_TYPE; +import static vid.automation.test.infra.Features.FLAG_1908_TRANSPORT_SERVICE_NEW_INSTANTIATION_UI; import static vid.automation.test.infra.ModelInfo.*; @@ -479,4 +480,39 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { assertFalse(Exists.tagNameInAnotherElement(serviceModelsTbody, "tr"), "Table should be empty on empty results"); resetGetServicesCache(); } + + private static final String[] macroModelsIds = { + "f1bde010-cc5f-4765-941f-75f15b24f9fc", + "lmoser410-connector-model-version-id", + "ipe-resource-id-ps-02", + "797a6c41-0f80-4d35-a288-3920c4e06baa", + }; + private static final String[] alacarteModelsIds = { + "0903e1c0-8e03-4936-b5c2-260653b96413", + "666a06ee-4b57-46df-bacf-908da8f10c3f", + "20c4431c-246d-11e7-93ae-92361f002671", + }; + + @DataProvider + public static Object[][] filterOrchestrationType() { + return new Object[][]{{"a la carte", 3, alacarteModelsIds},{"macro", 4, macroModelsIds}}; + } + + @Test(dataProvider = "filterOrchestrationType") + @FeatureTogglingTest(FLAG_SHOW_ORCHESTRATION_TYPE) + public void browseSdcModel_filterModelsWithOrchestrationType_alacarte( + String orchestrationType,int numberOfOccurrence, String[] expectedModelsIds) { + resetGetServicesCache(); + SimulatorApi.clearAll(); + BrowseASDCPage browseAsdcPage = registerSimulatorAndGoToBrowseSDC(); + GeneralUIUtils.ultimateWait(); + assertThat(browseAsdcPage.countCurrentRowsInTable(),(Matchers.greaterThan(numberOfOccurrence))); + browseAsdcPage.fillFilterText(orchestrationType); + Assert.assertEquals(browseAsdcPage.countCurrentRowsInTable(),numberOfOccurrence); + for(String id : expectedModelsIds) { + Assert.assertTrue(browseAsdcPage.isModelWithGivenServiceUUIDVisible(id)); + } + browseAsdcPage.fillFilterText(""); + } + } diff --git a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java index 7c577cabf..d9c771b6f 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java @@ -23,6 +23,7 @@ import com.aventstack.extentreports.Status; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Ints; + import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; @@ -33,6 +34,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; + import net.javacrumbs.jsonunit.core.Option; import org.json.JSONException; import org.junit.Assert; @@ -223,7 +225,7 @@ public class ChangeManagementTest extends VidBaseTestCase { , "changeManagement/mso_get_change_managements_scaleout.json" ); SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), APPEND); - if(FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG.isActive()){ + if (FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG.isActive()) { String AAI_VNFS_FOR_CHANGE_MANAGEMENT_JSON_BY_PARAMS = "registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type_with_modelVer.json"; String globalCustomerId = "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"; String serviceType = "vRichardson"; @@ -246,9 +248,9 @@ public class ChangeManagementTest extends VidBaseTestCase { if (Features.FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH.isActive()) { SimulatorApi.registerExpectationFromPreset(new PresetAAIGetTenants( - VNF_DATA_WITH_IN_PLACE.subscriberId, - VNF_DATA_WITH_IN_PLACE.serviceType, - "presets_templates/PresetAAIGetTenants_service_type_vWINIFRED.json"), SimulatorApi.RegistrationStrategy.APPEND); + VNF_DATA_WITH_IN_PLACE.subscriberId, + VNF_DATA_WITH_IN_PLACE.serviceType), + SimulatorApi.RegistrationStrategy.APPEND); } diff --git a/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json b/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json index 039d2d558..c3eca2e0a 100644 --- a/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json +++ b/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json @@ -1,5 +1,5 @@ { - "service-type": "TYLER SILVIA", + "service-type": "<service-type>", "resource-version": "1494001841964", "relationship-list": { "relationship": [ diff --git a/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants_service_type_vWINIFRED.json b/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants_service_type_vWINIFRED.json deleted file mode 100644 index 8cd6d19a7..000000000 --- a/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants_service_type_vWINIFRED.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "service-type": "vWINIFRED", - "resource-version": "1494001841964", - "relationship-list": { - "relationship": [ - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "irma-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "AAIAIC25" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "092eb9e8e4b7412e8787dd091bc58e86" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "USP-SIP-IC-24335-T-01" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "irma-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "hvf6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "bae71557c5bb4d5aac6743a4e5f1d054" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-testalexandria" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "irma-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "hvf6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "229bcdc6eaeb4ca59d55221141d01f8e" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-STTest2" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "irma-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "hvf6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "cb42a77ff45b48a8b8deb83bb64acc74" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "ro-T11" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "irma-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "hvf6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "fa45ca53c80b492fa8be5477cd84fc2b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "ro-T112" - } - ] - } - ] - } -} diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type_response.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type_response.json index 258cd0e1a..5ee78f308 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type_response.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type_response.json @@ -51,6 +51,38 @@ ] }, { + "id": "454760", + "node-type": "vf-module", + "url": "https://aai.onap.org:8443/aai/v13/network/generic-vnfs/generic-vnf/a9c90905-99f2-45d5-8389-a2e0f6997c25/vf-modules/vf-module/98da0cd7-008a-4935-864e-333bb97bd15a", + "properties": { + "vf-module-id": "98da0cd7-008a-4935-864e-333bb97bd15a", + "vf-module-name": "ws-vnf", + "heat-stack-id": "ws-vnf/ba8955da-912d-4aa7-8bbe-ff51025f56fe", + "orchestration-status": "active", + "is-base-vf-module": true, + "automated-assignment": false, + "resource-version": "1551709026933", + "model-invariant-id": "4c6d21f0-dc36-46e7-ba9e-c8b602054d12", + "model-version-id": "0040b766-37e8-42e7-a930-bfc568265735", + "model-customization-id": "1cb1464c-4bf2-4910-8eac-e7d27b597d58", + "module-index": 0 + }, + "related-to": [ + { + "id": "442472", + "relationship-label": "org.onap.relationships.inventory.BelongsTo", + "node-type": "generic-vnf", + "url": "/aai/v13/network/generic-vnfs/generic-vnf/a9c90905-99f2-45d5-8389-a2e0f6997c25" + }, + { + "id": "430168", + "relationship-label": "org.onap.relationships.inventory.Uses", + "node-type": "vserver", + "url": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/982c540f6e69488eb6be5664255e00c0/vservers/vserver/154e8975-5a59-4824-af5d-b6564b7b712a" + } + ] + }, + { "id": "3775807704", "node-type": "service-instance", "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700", diff --git a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java index 69267fd4d..4ca01dc63 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java @@ -3,7 +3,6 @@ package org.onap.vid.api; import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.IsNot.not; import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.defaultPlacement; import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.ofL3Network; import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.ofServiceInstance; @@ -99,6 +98,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_OK\",\n" + + " \"orchestrationType\": null,\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + " }, {\n" + @@ -112,6 +112,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_ERROR\",\n" + + " \"orchestrationType\": null,\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + " }, {\n" + @@ -124,6 +125,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lifecycleState\": null,\n" + " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + + " \"orchestrationType\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_OK\",\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + @@ -138,6 +140,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_OK\",\n" + + " \"orchestrationType\": null,\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + " }, {\n" + @@ -151,6 +154,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_OK\",\n" + + " \"orchestrationType\": null,\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + " }, {\n" + @@ -163,6 +167,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lifecycleState\": null,\n" + " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + + " \"orchestrationType\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_OK\",\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + @@ -176,6 +181,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lifecycleState\": null,\n" + " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + + " \"orchestrationType\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_OK\",\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + @@ -189,6 +195,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lifecycleState\": null,\n" + " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + + " \"orchestrationType\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_OK\",\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + @@ -202,6 +209,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lifecycleState\": null,\n" + " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + + " \"orchestrationType\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_OK\",\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + @@ -215,6 +223,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lifecycleState\": null,\n" + " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + + " \"orchestrationType\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_OK\",\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + @@ -228,6 +237,7 @@ public class AaiApiTest extends BaseApiAaiTest { " \"lifecycleState\": null,\n" + " \"lastUpdaterUserId\": null,\n" + " \"lastUpdaterFullName\": null,\n" + + " \"orchestrationType\": null,\n" + " \"distributionStatus\": \"DISTRIBUTION_COMPLETE_OK\",\n" + " \"artifacts\": null,\n" + " \"resources\": null\n" + @@ -730,6 +740,7 @@ public class AaiApiTest extends BaseApiAaiTest { getResourceAsString("serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json"), response); } + @FeatureTogglingTest(value = Features.FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG, flagActive = false) @Test public void getVnfDataByGlobalIdAndServiceType() { @@ -750,9 +761,8 @@ public class AaiApiTest extends BaseApiAaiTest { ResponseEntity<String> response = restTemplate.getForEntity(url, String.class); - assertThat(response.getBody(), not(containsString("generic-vfmodule"))); assertResponse(JsonAssert.when(Option.IGNORING_ARRAY_ORDER), - getResourceAsString("changeManagement/reduced_vnf_data_by_globalid_and_service_type.json"), + getResourceAsString("registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type_response.json"), response.getBody()); } 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 3ec0c16e4..e01ffe8b4 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 @@ -1,9 +1,8 @@ package org.onap.vid.more; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertThat; import com.fasterxml.jackson.databind.JsonNode; import java.net.URI; @@ -41,6 +40,11 @@ public class LoggerFormatTest extends BaseApiTest { validateLogsFormat("audit"); } + @Test + public void validateAudit2019LogsFormat() { + validateLogsFormat("audit2019", "audit-ELS-2019.11", 0); + } + @Test(enabled = false) // no total-score is returned for error-log public void validateErrorLogsFormat() { validateLogsFormat("error"); @@ -57,6 +61,10 @@ public class LoggerFormatTest extends BaseApiTest { } private void validateLogsFormat(String logName, String logType) { + validateLogsFormat(logName, logType, 0.95); + } + + private void validateLogsFormat(String logName, String logType, double score) { String logLines = getLogLines(logName); logger.info("logLines are: "+logLines); @@ -65,8 +73,8 @@ public class LoggerFormatTest extends BaseApiTest { double fieldscore = response.path("summary").path("score").path("fieldscore").asDouble(); double overall = response.path("summary").path("score").path("overallscore").asDouble(); - assertThat(fieldscore, is(greaterThan(0.95))); - assertThat(overall, is(greaterThan(0.95))); + assertThat(fieldscore, is(greaterThanOrEqualTo(score))); + assertThat(overall, is(greaterThanOrEqualTo(score))); } diff --git a/vid-automation/src/test/resources/changeManagement/reduced_vnf_data_by_globalid_and_service_type.json b/vid-automation/src/test/resources/changeManagement/reduced_vnf_data_by_globalid_and_service_type.json deleted file mode 100644 index 1f6a5eb2c..000000000 --- a/vid-automation/src/test/resources/changeManagement/reduced_vnf_data_by_globalid_and_service_type.json +++ /dev/null @@ -1,539 +0,0 @@ -{ - "results": [ - { - "id": "3400916992", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1", - "properties": { - "service-instance-id": "66b13cb4-b575-449f-aa45-ffbfe005c7b1", - "service-instance-name": "CHARLOTTE_preload_1710_0914", - "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "model-version-id": "1525f534-99a2-408f-b847-ff636997d352", - "resource-version": "1505856078810", - "orchestration-status": "Active" - }, - "related-to": [ - { - "id": "10207440", - "node-type": "service-subscription", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" - }, - { - "id": "3481829392", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec" - } - ] - }, - { - "id": "3771572432", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95", - "properties": { - "service-instance-id": "f195837b-ef28-42c3-8dea-47ad37eaed95", - "service-instance-name": "CHARLOTTE_preload_1710_0914_0920", - "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", - "resource-version": "1505964829466", - "orchestration-status": "Active" - }, - "related-to": [ - { - "id": "10207440", - "node-type": "service-subscription", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" - }, - { - "id": "3484520464", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1" - } - ] - }, - { - "id": "3775807704", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700", - "properties": { - "service-instance-id": "9ad4ac55-a5e0-4b49-95c0-b2d846abf700", - "service-instance-name": "CHARLOTTE_preload_1710_0914_100417", - "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", - "resource-version": "1507144734087", - "orchestration-status": "Active" - }, - "related-to": [ - { - "id": "10207440", - "node-type": "service-subscription", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" - }, - { - "id": "3783459064", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165" - } - ] - }, - { - "id": "4178862184", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2", - "properties": { - "service-instance-id": "599c7247-b083-447c-b6b1-0cdd5170dfd2", - "service-instance-name": "CHARLOTTE_preload_1710_0914_1010", - "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", - "resource-version": "1507664240411", - "orchestration-status": "Active" - }, - "related-to": [ - { - "id": "10207440", - "node-type": "service-subscription", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" - }, - { - "id": "3892133896", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a" - } - ] - }, - { - "id": "3008335920", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08", - "properties": { - "service-instance-id": "97315a05-e6f3-4c47-ae7e-d850c327aa08", - "service-instance-name": "CHARLOTTE_preload_1710_0914_0927", - "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", - "resource-version": "1506527653053", - "orchestration-status": "Active" - }, - "related-to": [ - { - "id": "10207440", - "node-type": "service-subscription", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" - }, - { - "id": "3418898432", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855" - } - ] - }, - { - "id": "3481829392", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec", - "properties": { - "vnf-id": "0c465dd3-4151-4da9-92a2-541bb3174cec", - "vnf-name": "Eoghan Fausto", - "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", - "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "prov-status": "PREPROV", - "orchestration-status": "Created", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1505856137206", - "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", - "model-version-id": "afacccf6-397d-45d6-b5ae-94c39734b168", - "model-customization-id": "b54689f8-45c5-4be2-9e91-f033e028feec", - "nf-type": "DNS", - "nf-function": "Mobile DNS", - "nf-role": "vWheeler", - "nf-naming-code": "null" - }, - "related-to": [ - { - "id": "3285635208", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/d49713bf-1bff-4eab-bed1-a8f1bb83aa98" - }, - { - "id": "3441209432", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/b8397fec-cf13-40b3-be8f-7d0912506419" - }, - { - "id": "3687522312", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/fd098a52-09be-4c48-a9e9-a565d1b39db3" - }, - { - "id": "3400916992", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1" - }, - { - "id": "3477385312", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" - } - ] - }, - { - "id": "3484520464", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1", - "properties": { - "vnf-id": "c2d2d389-fa00-4fb4-a269-e46d495719e1", - "vnf-name": "Odell Romana", - "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", - "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "prov-status": "PREPROV", - "orchestration-status": "Created", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1505964996823", - "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", - "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820", - "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994", - "nf-type": "DNS", - "nf-function": "Mobile DNS", - "nf-role": "vMobileDNS", - "nf-naming-code": "null" - }, - "related-to": [ - { - "id": "3447107680", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/c4711b5c-742e-4d03-8146-bff763f69fbd" - }, - { - "id": "3448307712", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/0ba3fcdd-0536-4ac7-a9ec-8d8622db7fb2" - }, - { - "id": "3692179528", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/6bb843eb-ef84-43b1-83b4-3154a7f9928c" - }, - { - "id": "3771588816", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/a4c008c6-cac0-4e3f-928f-90fa37dc8c4b" - }, - { - "id": "3904077944", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/eecb619c-a173-4ead-bf48-d4d09cbbdd5e" - }, - { - "id": "4027855088", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/1e29424e-2dca-45ac-b1df-59a8f74d0bc1" - }, - { - "id": "4390871192", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/b185220a-7f63-4b29-867d-1452813a4f09" - }, - { - "id": "4450529432", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/7a0c4b98-b3cc-490c-bbab-e2d7f169f2d7" - }, - { - "id": "3771572432", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95" - } - ] - }, - { - "id": "3783459064", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165", - "properties": { - "vnf-id": "54626a59-ec0d-4fa9-b0c2-08d008688165", - "vnf-name": "Dominika Fionnbharr", - "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", - "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "prov-status": "PREPROV", - "orchestration-status": "Created", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1507144948937", - "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", - "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820", - "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994", - "nf-type": "DNS", - "nf-function": "Mobile DNS", - "nf-role": "vMobileDNS", - "nf-naming-code": "null" - }, - "related-to": [ - { - "id": "3775807704", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700" - } - ] - }, - { - "id": "3892133896", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a", - "properties": { - "vnf-id": "d74503d8-abab-49c6-ba48-a6211eee9b7a", - "vnf-name": "CHARLOTTE_PreloadTest_VNF", - "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", - "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "prov-status": "PREPROV", - "orchestration-status": "Created", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1507664288548", - "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", - "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820", - "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994", - "nf-type": "DNS", - "nf-function": "Mobile DNS", - "nf-role": "vMobileDNS", - "nf-naming-code": "null" - }, - "related-to": [ - { - "id": "4178862184", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2" - } - ] - }, - { - "id": "1507690314", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/385548e2-3f31-4900-9437-317d0346e49a", - "properties": { - "vnf-id": "385548e2-3f31-4900-9437-317d0346e49a", - "vnf-name": "Senga Gabrielle", - "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", - "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "prov-status": "PREPROV", - "orchestration-status": "Created", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "7788675952902", - "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", - "model-version-id": "b217c612-7fcf-484c-861b-df0a5c4b5bcb", - "model-customization-id": "ce15d245-763c-4079-ac82-fe93007adb69", - "nf-type": "DNS", - "nf-function": "Mobile DNS", - "nf-role": "vMobileDNS", - "nf-naming-code": "null" - }, - "related-to": [ - { - "id": "3664617648", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" - }, - { - "id": "3008335920", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" - }, - { - "id": "3477385312", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" - } - ] - }, - { - "id": "5278880615", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0465e048-92a4-4a7f-bfe7-de39b32de4bd", - "properties": { - "vnf-id": "0465e048-92a4-4a7f-bfe7-de39b32de4bd", - "vnf-name": "Constantius Raghu", - "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", - "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "prov-status": "PREPROV", - "orchestration-status": "Created", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "7788675952902", - "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", - "model-version-id": "afacccf6-397d-45d6-b5ae-94c39734b168", - "model-customization-id": "ce15d245-763c-4079-ac82-fe93007adb69", - "nf-type": "DNS", - "nf-function": "Mobile DNS", - "nf-role": "vWheeler", - "nf-naming-code": "null" - }, - "related-to": [ - { - "id": "3664617648", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" - }, - { - "id": "3008335920", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" - }, - { - "id": "3477385312", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" - } - ] - }, - { - "id": "3418898432", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", - "properties": { - "vnf-id": "8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", - "vnf-name": "zolson3amdns02test2", - "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", - "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "prov-status": "PREPROV", - "orchestration-status": "Created", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "1507132024933", - "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", - "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820", - "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994", - "nf-type": "DNS", - "nf-function": "Mobile DNS", - "nf-role": "vMobileDNS", - "nf-naming-code": "null" - }, - "related-to": [ - { - "id": "3664617648", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" - }, - { - "id": "3008335920", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" - }, - { - "id": "3477385312", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" - }, - { - "id": "3647635704", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0" - }, - { - "id": "3664621744", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce" - }, - { - "id": "3975352504", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f" - }, - { - "id": "4059455552", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7" - }, - { - "id": "4098130088", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e" - }, - { - "id": "4401291416", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1" - }, - { - "id": "4458950808", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82" - } - ] - }, - { - "id": "1024648346", - "node-type": "generic-vnf", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/a58bf551-a79c-42d1-83b4-ed9288036245", - "properties": { - "vnf-id": "a58bf551-a79c-42d1-83b4-ed9288036245", - "vnf-name": "Harrison Kris", - "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", - "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "prov-status": "PREPROV", - "orchestration-status": "Created", - "in-maint": false, - "is-closed-loop-disabled": false, - "resource-version": "4679861552759", - "model-invariant-id": "00beb8f9-6d39-452f-816d-c709b9cbb87d", - "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413", - "model-customization-id": "14e8057d-b22a-405c-84aa-90b82bfd6e46", - "nf-type": "DNS", - "nf-function": "Mobile DNS", - "nf-role": "vMobileDNS", - "nf-naming-code": "null" - }, - "related-to": [ - { - "id": "3664617648", - "node-type": "vf-module", - "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" - }, - { - "id": "3008335920", - "node-type": "service-instance", - "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" - }, - { - "id": "3477385312", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" - }, - { - "id": "3647635704", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0" - }, - { - "id": "3664621744", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce" - }, - { - "id": "3975352504", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f" - }, - { - "id": "4059455552", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7" - }, - { - "id": "4098130088", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e" - }, - { - "id": "4401291416", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1" - }, - { - "id": "4458950808", - "node-type": "vserver", - "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82" - } - ] - } - ] - }
\ No newline at end of file diff --git a/vid-automation/src/test/resources/features.properties b/vid-automation/src/test/resources/features.properties index 796c8be8d..63b9fc61b 100644 --- a/vid-automation/src/test/resources/features.properties +++ b/vid-automation/src/test/resources/features.properties @@ -35,4 +35,4 @@ FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT = true FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH = false FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG = true FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE = false - +FLAG_SHOW_ORCHESTRATION_TYPE = false |