Fix Bug 2048:The VCA Status for an NS with both a KNF and a VNF does not provide...

[osm/NG-UI.git] / src / environments / environment.ts

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index e3acd4f..3f80777 100644 (file)
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -22,7 +22,7 @@
  * The list of file replacements can be found in `angular.json`.
  */
 
  * The list of file replacements can be found in `angular.json`.
  */
 

-import { version } from 'PACKAGEJSON';
+import PACKAGEJSON from 'PACKAGEJSON';

 
 /** OSM Admin URL @constant */
 const OSM_ADMIN_ENDPOINT: string = 'osm/admin/v1/';
 
 /** OSM Admin URL @constant */
 const OSM_ADMIN_ENDPOINT: string = 'osm/admin/v1/';


@@ -43,16 +43,15 @@ const ASSETS_PATH: string = 'assets/';
 /** OSM Version @constant */
 const OSM_VERSION: string = 'osm/version';
 /** Grafana End-Point @constant */
 /** OSM Version @constant */
 const OSM_VERSION: string = 'osm/version';
 /** Grafana End-Point @constant */

-// tslint:disable-next-line: no-http-string
+// eslint-disable-next-line @microsoft/sdl/no-insecure-url

 const GRAFANA_ENDPOINT: string = 'http://' + window.location.hostname + ':3000';
 
 /** Exporting a const @exports environment */
 const GRAFANA_ENDPOINT: string = 'http://' + window.location.hostname + ':3000';
 
 /** Exporting a const @exports environment */

-// tslint:disable-next-line: typedef

 export const environment = {
     production: false,
     packageSize: 50,
     paginationNumber: 10, //Possible values are 10, 25, 50, 100
 export const environment = {
     production: false,
     packageSize: 50,
     paginationNumber: 10, //Possible values are 10, 25, 50, 100

-    packageVersion: version,
+    packageVersion: PACKAGEJSON.version,

     GENERATETOKEN_URL: OSM_ADMIN_ENDPOINT + 'tokens',
     PROJECTS_URL: OSM_ADMIN_ENDPOINT + 'projects',
     USERS_URL: OSM_ADMIN_ENDPOINT + 'users',
     GENERATETOKEN_URL: OSM_ADMIN_ENDPOINT + 'tokens',
     PROJECTS_URL: OSM_ADMIN_ENDPOINT + 'projects',
     USERS_URL: OSM_ADMIN_ENDPOINT + 'users',


@@ -67,6 +66,7 @@ export const environment = {
     NSDINSTANCES_URL: OSM_NSLCM_ENDPOINT + 'ns_instances',
     VNFINSTANCES_URL: OSM_NSLCM_ENDPOINT + 'vnfrs',
     NSINSTANCESCONTENT_URL: OSM_NSLCM_ENDPOINT + 'ns_instances_content',
     NSDINSTANCES_URL: OSM_NSLCM_ENDPOINT + 'ns_instances',
     VNFINSTANCES_URL: OSM_NSLCM_ENDPOINT + 'vnfrs',
     NSINSTANCESCONTENT_URL: OSM_NSLCM_ENDPOINT + 'ns_instances_content',

+    NSINSTANCESTERMINATE_URL: OSM_NSLCM_ENDPOINT + 'ns_instances_terminate',

     NSHISTORYOPERATIONS_URL: OSM_NSLCM_ENDPOINT + 'ns_lcm_op_occs',
     NETWORKSLICEINSTANCESCONTENT_URL: OSM_NSILCM_ENDPOINT + 'netslice_instances_content',
     NSTHISTORYOPERATIONS_URL: OSM_NSILCM_ENDPOINT + 'nsi_lcm_op_occs',
     NSHISTORYOPERATIONS_URL: OSM_NSLCM_ENDPOINT + 'ns_lcm_op_occs',
     NETWORKSLICEINSTANCESCONTENT_URL: OSM_NSILCM_ENDPOINT + 'netslice_instances_content',
     NSTHISTORYOPERATIONS_URL: OSM_NSILCM_ENDPOINT + 'nsi_lcm_op_occs',