* FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE
Let the user set the order of resource instantiation while using drawing board (new view edit)
for a-la-carte instantiation.
+
+* FLAG_SHOW_ORCHESTRATION_TYPE
+ enables showing/hiding (true/false) column with orchestration type in Service Model browser.
+ The types are fetched from aai.
\ No newline at end of file
private String distributionStatus;
private String resourceVersion;
private String modelDescription;
+ private String orchestrationType;
this.modelDescription = modelDescription;
}
+ public String getOrchestrationType() {
+ return orchestrationType;
+ }
+
+ @JsonAlias("orchestration-type")
+ public void setOrchestrationType(String orchestrationType) {
+ this.orchestrationType = orchestrationType;
+ }
}
import java.util.Collection;
import java.util.UUID;
-/**
- * The Class Service.
- */
public class Service {
- /**
- * The Enum DistributionStatus.
- */
public enum DistributionStatus {
- /** The distribution not approved. */
DISTRIBUTION_NOT_APPROVED,
- /** The distribution approved. */
DISTRIBUTION_APPROVED,
- /** The distributed. */
DISTRIBUTED,
- /** The distribution rejected. */
DISTRIBUTION_REJECTED,
- /** The destributed for tenant isolation. */
DISTRIBUTION_COMPLETE_OK
}
- /**
- * The Enum LifecycleState.
- */
public enum LifecycleState {
- /** The not certified checkout. */
NOT_CERTIFIED_CHECKOUT,
- /** The not certified checkin. */
NOT_CERTIFIED_CHECKIN,
- /** The ready for certification. */
READY_FOR_CERTIFICATION,
- /** The certification in progress. */
CERTIFICATION_IN_PROGRESS,
- /** The certified. */
CERTIFIED
}
- /** 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;
- /** The lifecycle state. */
private Service.LifecycleState lifecycleState;
- /** The last updater user uid. */
private String lastUpdaterUserId;
- /** The last updater full name. */
private String lastUpdaterFullName;
- /** The distribution status. */
private String distributionStatus;
- /** The artifacts. */
private Collection<Artifact> artifacts;
- /** The resources. */
private Collection<SubResource> resources;
+
+ private String orchestrationType;
public static class ServiceBuilder {
private String distributionStatus;
private Collection<Artifact> artifacts;
private Collection<SubResource> resources;
+ private String orchestrationType;
public ServiceBuilder setUuid(String uuid) {
this.uuid = uuid;
return this;
}
+ public ServiceBuilder setOrchestrationType(String orchestrationType) {
+ this.orchestrationType = orchestrationType;
+ return this;
+ }
+
public Service build() {
return new Service(this);
}
}
- /**
- * Gets the uuid.
- *
- * @return the uuid
- */
public String getUuid() {
return uuid;
}
- /**
- * Gets the invariant UUID.
- *
- * @return the invariant UUID
- */
public String getInvariantUUID() {
return invariantUUID;
}
- /**
- * Gets the name.
- *
- * @return the name
- */
public String getName() {
return name;
}
- /**
- * Gets the version.
- *
- * @return the version
- */
public String getVersion() {
return version;
}
- /**
- * Gets the tosca model URL.
- *
- * @return the tosca model URL
- */
public String getToscaModelURL() {
return toscaModelURL;
}
- /**
- * Gets the category.
- *
- * @return the category
- */
public String getCategory() {
return category;
}
- /**
- * Gets the lifecycle state.
- *
- * @return the lifecycle state
- */
public Service.LifecycleState getLifecycleState() {
return lifecycleState;
}
- /**
- * Gets the last updater user uid.
- *
- * @return the last updater user uid
- */
public String getLastUpdaterUserId() {
return lastUpdaterUserId;
}
- /**
- * Gets the last updater full name.
- *
- * @return the last updater full name
- */
public String getLastUpdaterFullName() {
return lastUpdaterFullName;
}
- /**
- * Gets the distribution status.
- *
- * @return the distribution status
- */
public String getDistributionStatus() {
return distributionStatus;
}
- /**
- * Gets the artifacts.
- *
- * @return the artifacts
- */
public Collection<Artifact> getArtifacts() {
return artifacts;
}
- /**
- * Gets the resources.
- *
- * @return the resources
- */
public Collection<SubResource> getResources() {
return resources;
}
- /**
- * Sets the uuid.
- *
- * @param uuid the new uuid
- */
+ public String getOrchestrationType() {
+ return orchestrationType;
+ }
+
public void setUuid(String uuid) {
this.uuid = uuid;
}
- /**
- * Sets the invariant UUID.
- *
- * @param invariantUUID the new invariant UUID
- */
public void setInvariantUUID(String invariantUUID) {
this.invariantUUID = invariantUUID;
}
- /**
- * Sets the name.
- *
- * @param name the new name
- */
public void setName(String name) {
this.name = name;
}
- /**
- * Sets the version.
- *
- * @param version the new version
- */
public void setVersion(String version) {
this.version = version;
}
- /**
- * Sets the tosca model URL.
- *
- * @param toscaModelURL the new tosca model URL
- */
public void setToscaModelURL(String toscaModelURL) {
this.toscaModelURL = toscaModelURL;
}
- /**
- * Sets the category.
- *
- * @param category the new category
- */
public void setCategory(String category) {
this.category = category;
}
- /**
- * Sets the lifecycle state.
- *
- * @param lifecycleState the new lifecycle state
- */
public void setLifecycleState(Service.LifecycleState lifecycleState) {
this.lifecycleState = lifecycleState;
}
- /**
- * Sets the last updater user uid.
- *
- * @param lastUpdaterUserId the new last updater user uid
- */
public void set(String lastUpdaterUserId) {
this.lastUpdaterUserId = lastUpdaterUserId;
}
- /**
- * Sets the last updater full name.
- *
- * @param lastUpdaterFullName the new last updater full name
- */
public void setLastUpdaterFullName(String lastUpdaterFullName) {
this.lastUpdaterFullName = lastUpdaterFullName;
}
- /**
- * Sets the distribution status.
- *
- * @param distributionStatus the new distribution status
- */
public void setDistributionStatus(String distributionStatus) {
this.distributionStatus = distributionStatus;
}
- /**
- * Sets the artifacts.
- *
- * @param artifacts the new artifacts
- */
public void setArtifacts(Collection<Artifact> artifacts) {
this.artifacts = artifacts;
}
- /**
- * Sets the resources.
- *
- * @param resources the new resources
- */
public void setResources(Collection<SubResource> resources) {
this.resources = resources;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
+ public void setOrchestrationType(String orchestrationType) {
+ this.orchestrationType = orchestrationType;
+ }
+
@Override
public String toString() {
return uuid;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
return UUID.fromString(getUuid()).hashCode();
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object o) {
if (o == this)
this.distributionStatus = serviceBuilder.distributionStatus;
this.artifacts = serviceBuilder.artifacts;
this.resources = serviceBuilder.resources;
+ this.orchestrationType = serviceBuilder.orchestrationType;
}
}
FLAG_PNP_INSTANTIATION,
FLAG_HANDLE_SO_WORKFLOWS,
FLAG_CREATE_ERROR_REPORTS,
+ FLAG_SHOW_ORCHESTRATION_TYPE,
FLAG_DISABLE_HOMING,
FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG,
FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT,
.setToscaModelURL(null)
.setLifecycleState(null)
.setArtifacts(null)
- .setResources(null).build();
+ .setResources(null)
+ .setOrchestrationType(modelVer.getOrchestrationType())
+ .build();
FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH=false
FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG = false
FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE = false
+FLAG_SHOW_ORCHESTRATION_TYPE = false
FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
FLAG_HANDLE_SO_WORKFLOWS = true
FLAG_CREATE_ERROR_REPORTS = true
+FLAG_SHOW_ORCHESTRATION_TYPE = false
# Modern UI (Drawing-Board; View/Edit)
# - - - - - - - - - - - - - - - - - -
FLAG_1908_RELEASE_TENANT_ISOLATION: "FLAG_1908_RELEASE_TENANT_ISOLATION",
FLAG_FLASH_REPLACE_VF_MODULE: "FLAG_FLASH_REPLACE_VF_MODULE",
FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT: "FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT",
+ FLAG_SHOW_ORCHESTRATION_TYPE: "FLAG_SHOW_ORCHESTRATION_TYPE",
}
};
});\r
};\r
\r
+ $scope.isShowOrchestrationType = function() {\r
+ return featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_SHOW_ORCHESTRATION_TYPE);\r
+ };\r
+\r
var wholeData=[];\r
\r
$scope.filterDataWithHigherVersion = function(serviceData){\r
<tr>\r
<th att-table-header key="action">Action</th>\r
<th att-table-header key="uuid">UUID</th>\r
+ <th ng-if="isShowOrchestrationType()" att-table-header key="orchestrationType">Orchestration Type</th>\r
<th att-table-header key="invariantUUID">Invariant UUID</th>\r
<th att-table-header default-sort="A" key="name">Name</th>\r
<th att-table-header key="version">Version</th>\r
<tr class="sdcServiceModel" data-tests-id="Browse_SDC_Service_Models-uuid-{{service['uuid']}}">\r
<td class="deploy" att-table-body ><button class="deploy-service-class" type=button data-tests-id="deploy-{{service['uuid']}}" ng-click="deployService(service)" att-button btn-type="{{deployButtonType}}" size="small">Deploy</button></td>\r
<td class="uuid" att-table-body ng-bind="service['uuid']"></td>\r
+ <td ng-if="isShowOrchestrationType()" class="orchestrationType" att-table-body ng-bind="service['orchestrationType']"></td>\r
<td class="invariantUUID" att-table-body data-tests-id="Invariant-{{service['invariantUUID']}}" ng-bind="service['invariantUUID']"></td>\r
<td class="name" att-table-body ng-bind="service['name']"></td>\r
<td class="version" att-table-body ng-bind="service['version']"></td>\r
" {" +
" \"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\"" +
" {" +
" \"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\"" +
" {" +
" \"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\"" +
" {" +
" \"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\"," +
" {" +
" \"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\": {" +
" {" +
" \"model-version-id\": \"ipe-resource-id-ps-02\"," +
" \"model-name\": \"abc\"," +
+ " \"orchestration-type\": \"macro\"," +
" \"model-version\": \"v1.0\"," +
" \"resource-version\": \"1493389520357\"," +
" \"relationship-list\": {" +
" {" +
" \"model-version-id\": \"lmoser410-connector-model-version-id\"," +
" \"model-name\": \"connector\"," +
+ " \"orchestration-type\": \"macro\"," +
" \"model-version\": \"v1.0\"," +
" \"resource-version\": \"1493389444766\"" +
" }" +
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,
}
public int countCurrentRowsInTable(){
- List<WebElement> rowsInTable = Get.byClass("alt-row");
+ List<WebElement> rowsInTable = Get.byClass("sdcServiceModel");
return rowsInTable.size();
}
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;
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();
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.*;
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("");
+ }
+
}
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
Code Review / vid.git / commitdiff