X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Flibraries%2Fmodel%2FDescriptorModelSerializer.js;h=014beb32bb1cfba62656352099e656259d9ed459;hb=refs%2Fchanges%2F52%2F652%2F1;hp=4e6b792645f866b6aa1f9a8b93bccbd8cf317ed1;hpb=c02d242125c45704991405449fbeb35de8c9687c;p=osm%2FUI.git

diff --git a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelSerializer.js b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelSerializer.js
index 4e6b79264..014beb32b 100644
--- a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelSerializer.js
+++ b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelSerializer.js
@@ -1,6 +1,6 @@
 
 /*
- * 
+ *
  *   Copyright 2016 RIFT.IO Inc
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -121,7 +121,9 @@ const DescriptorModelSerializer = {
 				return constituentVNFD;
 
 			});
-
+			for (var key in confd) {
+				checkForChoiceAndRemove(key, confd, nsdModel);
+			}
 			// serialize the VLD instances
 			confd.vld = confd.vld.map(d => {
 				return DescriptorModelSerializer.serialize(d);
@@ -142,11 +144,15 @@ const DescriptorModelSerializer = {
 			// once that is fixed, remove this piece of code.
 			// fix-start
 			for (var key in confd) {
-				if (confd.hasOwnProperty(key) && confd[key] === '') {
-					delete confd[key];
-				}
+			  	if (confd.hasOwnProperty(key) && confd[key] === '') {
+                	delete confd[key];
+                } else {
+                	//removes choice properties from top level object and copies immediate children onto it.
+					checkForChoiceAndRemove(key, confd, vldModel);
+                }
 			}
 
+
 			const deepProperty = 'provider-network';
 			for (var key in confd[deepProperty]) {
 				if (confd[deepProperty].hasOwnProperty(key) && confd[deepProperty][key] === '') {
@@ -154,8 +160,6 @@ const DescriptorModelSerializer = {
 				}
 			}
 			// fix-end
-
-
 			confd[property] = confd[property].map(d => DescriptorModelSerializer[property].serialize(d));
 			return confd;
 		}
@@ -186,10 +190,31 @@ const DescriptorModelSerializer = {
 	},
 	vdu: {
 		serialize(vduModel) {
-			const confd = _.omit(vduModel, ['uiState']);
+			const copy = _.cloneDeep(vduModel);
+			for (let k in copy) {
+				checkForChoiceAndRemove(k, copy, vduModel)
+			}
+			const confd = _.omit(copy, ['uiState']);
 			return confd;
 		}
 	}
 };
 
+
+function checkForChoiceAndRemove(k, confd, model) {
+	let state = model.uiState;
+	if (state.choice) {
+		let choice = state.choice[k]
+		if(choice) {
+			for (let key in confd[k]) {
+				if(choice && (choice.selected.indexOf(key) > -1)) {
+					confd[key] = confd[k][key]
+				}
+			};
+			delete confd[k];
+		}
+	}
+	return confd;
+}
+
 export default DescriptorModelSerializer;