aboutsummaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/src/app/factories/mso.factory.ts
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2018-08-29 17:01:32 +0300
committerIttay Stern <ittay.stern@att.com>2019-02-18 18:35:30 +0200
commit6f900cc45d7dd7f97430812b86b5c1d1693c8ae3 (patch)
tree936005c364dc5a7264d6304d4777c3d83494db22 /vid-webpack-master/src/app/factories/mso.factory.ts
parent67d99f816cc583643c35193197594cf78d8ce60a (diff)
merge from ecomp a88f0072 - Modern UI
Issue-ID: VID-378 Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6 Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/src/app/factories/mso.factory.ts')
-rw-r--r--vid-webpack-master/src/app/factories/mso.factory.ts26
1 files changed, 12 insertions, 14 deletions
diff --git a/vid-webpack-master/src/app/factories/mso.factory.ts b/vid-webpack-master/src/app/factories/mso.factory.ts
index c26296edf..ebca83412 100644
--- a/vid-webpack-master/src/app/factories/mso.factory.ts
+++ b/vid-webpack-master/src/app/factories/mso.factory.ts
@@ -1,4 +1,12 @@
-import { RequestInfo, RequestDetails, ModelInfo, CloudConfiguration, LineOfBusiness, Platform, RelatedInstanceList, VfcModel } from "./models/requestDetails.model";
+import {
+ CloudConfiguration,
+ LineOfBusiness,
+ ModelInfo,
+ Platform,
+ RelatedInstanceList,
+ RequestDetails,
+ RequestInfo
+} from "./models/requestDetails.model";
import * as _ from "lodash";
function extractModelInfoFromNodeTemplate(node: any, type: string) {
@@ -33,10 +41,6 @@ function extractPlatform(userInputs: any): Platform {
return platform;
}
-function extractVfcGroupModelAccordingToUuid(vnfModel: any, vfcUuid: string) {
- return _.find(vnfModel.vfcInstanceGroups, { uuid: vfcUuid });
-}
-
function extractLineOfBusiness(userInputs: any) {
let lob: LineOfBusiness = <LineOfBusiness>{};
lob.lineOfBusinessName = userInputs["lineOfBusiness"];
@@ -50,13 +54,9 @@ function extractCloudConfiguration(userInputs: any) {
return cloudConfig;
}
-function extractModelInfoFromVfcNode(vfcModel: VfcModel): ModelInfo {
+function extractModelInfoFromVfcNode(): ModelInfo {
let modelinfo: ModelInfo = <ModelInfo>{};
- modelinfo.modelName = vfcModel.name;
- modelinfo.modelType = "networkCollection";
- modelinfo.modelVersion = vfcModel.version;
- modelinfo.modelVersionId = vfcModel.uuid;
- modelinfo.modelInvariantId = vfcModel.invariantUuid;
+ modelinfo.modelType = "networkInstanceGroup";
return modelinfo;
}
@@ -77,12 +77,10 @@ export function createRequest(userId: string, userInputs: any, service: any, ser
};
request.relatedInstanceList.push(serviceRelatedInstance);
_.forOwn(networkInstanceGroups, function(group) {
- let modelUuid = group["instance-group"]["model-version-id"];
- let vfcModel = extractVfcGroupModelAccordingToUuid(service.vnfs[vnfCustomizationName], modelUuid);
let networkInstanceGroup: RelatedInstanceList = {
relatedInstance: {
instanceId: group["instance-group"].id,
- modelInfo: extractModelInfoFromVfcNode(vfcModel)
+ modelInfo: extractModelInfoFromVfcNode()
}
};
request.relatedInstanceList.push(networkInstanceGroup);