diff options
author | 2020-02-09 14:06:25 +0200 | |
---|---|---|
committer | 2020-02-23 15:36:56 +0000 | |
commit | 44ffee127dc8f1dc4cd793f4dd1e375057c33086 (patch) | |
tree | a62ff96adc333543cf2d8abf4b2d72ee7607b7e4 /vid-webpack-master/src/app/shared/models | |
parent | d6eedb1f342ac32c8339b553848267e443410d57 (diff) |
upgrade vfmodule when upgraded already service, vnf and brother vfmodule e2e
- Use modelCustomizationId and modelVersionId from instance, instead of service-model hierarchy
- Adds a Cypress test-case in viewEditUpgradeVfModule.e2e.ts
- Assumes topology improved response in payload of:
upgrade_vfmodule_when_service_vnf_and_brother_vfmodule_alredy_upgraded_e2e__service_instance.json
(see Change Ib25c6cf7269614f2f4d332b3aa84b3307a59ebda)
Issue-ID: Issue-ID: VID-771
Change-Id: I9d200dd619a3c3d0503f47777efd3780eaa2b7b2
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Diffstat (limited to 'vid-webpack-master/src/app/shared/models')
-rw-r--r-- | vid-webpack-master/src/app/shared/models/treeNodeModel.ts | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vid-webpack-master/src/app/shared/models/treeNodeModel.ts b/vid-webpack-master/src/app/shared/models/treeNodeModel.ts index 39f56228e..8da204ce6 100644 --- a/vid-webpack-master/src/app/shared/models/treeNodeModel.ts +++ b/vid-webpack-master/src/app/shared/models/treeNodeModel.ts @@ -34,9 +34,14 @@ export class TreeNodeModel { instanceName?: string; constructor(instance: ChildNodeInstance, nodeModel: NodeModel){ + this.modelInvariantId = nodeModel.invariantUuid; - this.modelCustomizationId = nodeModel.customizationUuid; - this.modelId = nodeModel.uuid; + if (instance.modelInfo) { + this.modelCustomizationId = instance.modelInfo.modelCustomizationId; + this.modelId = instance.modelInfo.modelVersionId; + } else { + console.debug("no 'modelInfo' in node-instance", instance) + } this.modelUniqueId = this.modelCustomizationId || this.modelId; this.missingData = false; this.id = instance.trackById; |