diff options
author | Ittay Stern <ittay.stern@att.com> | 2018-12-31 17:21:27 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-01-09 20:19:55 +0200 |
commit | 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (patch) | |
tree | 3bd672dff83e3218232cd8665680416b7fc26a5d /vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html | |
parent | 5ec29ff5e3864f1ba6ecac71f8bffbefa400cf27 (diff) |
Merge from ECOMP's repository
Main Features
--------------
- Async-Instantiation jobs mechanism major update; still WIP (package
`org.onap.vid.job`)
- New features in View/Edit: Activate fabric configuration; show
related networks; soft delete
- Support AAI service-tree traversal (`AAIServiceTree`)
- In-memory cache for SDC models and certain A&AI queries
(`CacheProviderWithLoadingCache`)
- Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
models
- Resolve Cloud-Owner values for MSO
- Pass X-ONAP headers to MSO
Infrastructure
--------------
- Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
- Surefire invokes both TestNG and JUnit tests
- Support Kotlin source files
- AaiController2 which handles errors in a "Spring manner"
- Inline generated-sources and remove jsonschema2pojo
Quality
--------
- Cumulative bug fixes (A&AI API, UI timeouts, and many more)
- Many Sonar issues cleaned-up
- Some unused classes removed
- Minor changes in vid-automation project, allowing some API
verification to run
Hard Merges
------------
- HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
- Moved `package org.onap.vid.controllers` to `controller`, without
plural -- just to keep semantic sync with ECOMP.
Reference commit in ECOMP: 3d1141625
Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html')
-rw-r--r-- | vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html new file mode 100644 index 000000000..bb90ce1f6 --- /dev/null +++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html @@ -0,0 +1,78 @@ +<link rel="stylesheet" type="text/css" href="app/vid/styles/buttons.css"/> +<link rel="stylesheet" type="text/css" href="app/vid/styles/modals.css"/> +<link rel="stylesheet" type="text/css" href="app/vid/styles/networkNode.css"/> + <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.css"/> + +<div class="modal-header"> + <span class="title" data-tests-id="modalTitle">{{action}} VF-Module</span> + <span class="top-btn sprite modal-x" data-ng-click="cancel()"></span> +</div> + +<form name="regionSectionForm" class="region-section" novalidate data-ng-class="{'is-loading': !lcpAndTenant && !isHomingData}"> + <div class="modal-body" id="modal-body"> + <div class="user-explanation"> + <span data-ng-if="isSoftDeleteEnabled"> + <h4>Please select from the following options for {{vfModuleName}}:</h4> + <b>Delete</b>: Permanently delete the VF-Module and its assignments.<br> + <b>Soft-Delete</b>: Delete the VF-Module from the cloud but retain all its assignments. + This will allow you to rebuild the same VF-module later on by clicking the Resume button. + </span> + <span data-ng-if="!isSoftDeleteEnabled && !isResumeEnabled"> + Are you sure you want to permanently delete this VF-Module ({{vfModuleName}})? + </span> + <span data-ng-if="isResumeEnabled && isHomingData"> + Are you sure you would like to resume instantiation of ({{vfModuleName}})? + </span> + </div> + + <div class="spinner"> + <img src="app/vid/images/spinner.gif"> + </div> + + <div class="region-user-selection" data-ng-if="!isHomingData"> + <span data-ng-if="!isResumeEnabled">Please provide the following information as entered on instantiation:</span> + <span data-ng-if="isResumeEnabled">Instantiation of the VF module ({{vfModuleName}}) with the same information provided requires the following homing information: </span> + <div class="lcp-region field"> + <label>LCP Region</label> + <select name="lcp-region" required class="form-item wide" + data-tests-id="lcpRegion" data-ng-model="regionSelection.lcpRegion" + data-ng-change="regionSelection.tenant = null; regionSelection.legacyRegion = null;"> + <option class="lcp-region-placeholder" value="" selected>Select LCP Region</option> + <option ng-repeat="option in lcpRegionList" value="{{option.cloudRegionId}}" + data-ng-if="option.isPermitted && !isFeatureFlagCloudOwner">{{option.cloudRegionId}} + </option> + + <option ng-repeat="option in lcpRegionList" value="{{option.cloudRegionId}}" + data-ng-if="option.isPermitted && isFeatureFlagCloudOwner"> + {{option.cloudRegionId}} ({{option.cloudOwner.trim().toUpperCase().replace("ATT-", "")}}) + </option> + </select> + </div> + + <div class="legacy-region field" data-ng-if="(megaRegion).indexOf(regionSelection.lcpRegion) > -1"> + <label>Legacy Region</label> + <input type="text" data-tests-id="lcpRegionText" required data-ng-model="regionSelection.legacyRegion" + placeholder="Enter legacy region"> + </div> + + <div class="tenant field"> + <label>Tenant</label> + <select name="tenant" required class="form-item wide" + data-tests-id="tenant" data-ng-model="regionSelection.tenant"> + <option class="tenant-placeholder" value="" selected>Select Tenant Name</option> + <option ng-repeat="option in lcpAndTenant" class="tenantOption" value="{{option.tenantId}}" + data-ng-if="option.isPermitted && option.cloudRegionId === regionSelection.lcpRegion">{{option.tenantName}} + </option> + </select> + </div> + </div> + </div> + + <div class="modal-footer"> + <button class="soft-delete-btn blue" data-ng-if="isSoftDeleteEnabled" data-tests-id="softDeleteButton" + data-ng-click="softDelete()" ng-disabled="regionSectionForm.$invalid">Soft Delete</button> + <button class="delete-resume-btn blue" data-tests-id="confirmResumeDeleteButton" data-ng-click="deleteOrResume()" + ng-disabled="regionSectionForm.$invalid">{{action}}</button> + <button class="cancel-btn white" data-tests-id="cancel" data-ng-click="cancel()">Cancel</button> + </div> +</form> |