From: Alexey Sandler <alexey.sandler@intl.att.com>
Date: Tue, 3 Mar 2020 09:21:10 +0000 (+0200)
Subject: remove duplicate "model version" field from ncf
X-Git-Tag: 6.0.3~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=48781cf7a2ce980c75bb7844b90dbd8194f09989;p=vid.git

remove duplicate "model version" field from ncf

Issue-ID: Issue-ID: VID-771
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: I0a2df987ec53e25ae5e4c06fb5c27ab4dfbff5a5
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
---

diff --git a/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
index 1a925b3d8..b6be8a1ba 100644
--- a/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
@@ -117,7 +117,7 @@ describe('Drawing board : Collection resource', function () {
       const expectedComponentInfo: { [key: string]: any } = {
         'node-ce8c98bc-4691-44fb-8ff0-7a47487c11c4-undefined': {
           labelsAndValues: [
-            //['Model version', "5.0"] //to add once fix in code
+            ['Model version', "5.0"] ,
             ['Instance ID', '84a351ae-3601-45e2-98df-878d6c816abc'],
             ['In maintenance', 'false']
           ],
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/ncf/ncf.model.info.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/ncf/ncf.model.info.spec.ts
index 951145870..252a58d37 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/ncf/ncf.model.info.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/ncf/ncf.model.info.spec.ts
@@ -73,7 +73,7 @@ describe('NCF Model Info', () => {
     expect(ncfTreeNode).toMatchObject(expected);
   });
 
-  test('get modelInformation shall return Model version, role, Collection function, Number of networks', () => {
+  test('get modelInformation shall return Role, Collection function, Number of networks', () => {
     const ncf = {
       trackById: "6b3536cf-3a12-457f-abb5-fa2203e0d923",
       instanceGroupRole: "SUB_INTERFACE",
@@ -84,7 +84,6 @@ describe('NCF Model Info', () => {
 
     const actualModelInformationItems = ncfModel.getInfo(null, ncf);
     const expected = [
-      ModelInformationItem.createInstance('Model version', '35'),
       ModelInformationItem.createInstance('Role', 'SUB_INTERFACE'),
       ModelInformationItem.createInstance('Collection function', 'vTSBC Customer Landing Network Collection'),
       ModelInformationItem.createInstance('Number of networks', 1),
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/ncf/ncf.model.info.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/ncf/ncf.model.info.ts
index 650d975c9..f019daaab 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/ncf/ncf.model.info.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/ncf/ncf.model.info.ts
@@ -111,7 +111,6 @@ export class NcfModelInfo implements ILevelNodeInfo {
     }
 
     return [
-      ModelInformationItem.createInstance("Model version", instance.modelVersion),
       ModelInformationItem.createInstance('Role', instance.instanceGroupRole),
       ModelInformationItem.createInstance('Collection function', instance.instanceGroupFunction),
       ModelInformationItem.createInstance('Number of networks', instance.numberOfNetworks),