RIFT-14828: object Top level choice statements supported in composer

[osm/UI.git] / skyquake / plugins / composer / src / src / libraries / model / DescriptorModelSerializer.js

diff --git a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelSerializer.js b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelSerializer.js
index 7581ed5..cebb946 100644 (file)
--- 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");
@@ -145,8 +145,11 @@ const DescriptorModelSerializer = {
                                if (confd.hasOwnProperty(key) && confd[key] === '') {
                                        delete confd[key];
                                }
+                               //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] === '') {
@@ -165,6 +168,11 @@ const DescriptorModelSerializer = {
                        return _.pick(ref, ['member-vnf-index-ref', 'vnfd-id-ref', 'vnfd-connection-point-ref']);
                }
        },
+       'internal-connection-point': {
+               serialize(ref) {
+                       return _.pick(ref, ['id-ref']);
+               }
+       },
        'constituent-vnfd': {
                serialize(cvnfdModel) {
                        if(!cvnfdFields) cvnfdFields = DescriptorModelMetaFactory.getModelFieldNamesForType('nsd.constituent-vnfd');
@@ -181,10 +189,29 @@ const DescriptorModelSerializer = {
        },
        vdu: {
                serialize(vduModel) {
-                       const confd = _.omit(vduModel, ['uiState']);
+                       const copy = _.clone(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]) {
+                                                       confd[key] = confd[k][key]
+                                               };
+                                               delete confd[k];
+                                       }
+                               }
+                               return confd;
+                       }
+
 export default DescriptorModelSerializer;