org.onap migration

Change-Id: I52f0b2851f2c765752b6d21f49b32136d7d72a3d
Issue-ID: VID-86
Signed-off-by: Ofir Sonsino <os0695@att.com>

1 files changed, 312 insertions, 61 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/msoService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/msoService.js
index 68c8503dc..67211d48b 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/msoService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/msoService.js
@@ -20,7 +20,7 @@
 

 "use strict";

 

-var MsoService = function($http, $log, PropertyService, AaiService, UtilityService, COMPONENT, FIELD, $q) {

+var MsoService = function($http, $log, $q, PropertyService, AaiService, UtilityService, COMPONENT, FIELD) {

 

     var _this = this;

 

@@ -55,49 +55,60 @@ var MsoService = function($http, $log, PropertyService, AaiService, UtilityServi
         }

     };

 

-    var activateInstance = function(instance, model) {

-        var deferred = $q.defer();

+    var buildPayloadForServiceActivateDeactivate = function (model, userId, aicZone) {

+        var requestDetails = {

+                "modelInfo": {

+                    "modelType": "service",

+                    "modelInvariantId": model.service.invariantUuid,

+                    "modelVersionId": model.service.uuid,

+                    "modelName": model.service.name,

+                    "modelVersion": model.service.version

+                },

+                "requestInfo": {

+                    "source": "VID",

+                    "requestorId": userId

+                },

+                "requestParameters": {

+                    "userParams": [{

+                        "name": "aic_zone",

+                        "value": aicZone

+                    }]

+                }

+        };

 

-        AaiService.getLoggedInUserID(function (response) {

-            var userID = response.data;

+        $log.debug("Service Activate/Deactivate payload", requestDetails);

 

-            AaiService.getAicZoneForPNF(instance.globalCustomerId, model.service.serviceType, instance.serviceInstanceId, function (aicZone) {

+        return requestDetails;

 

-                var requestDetails = {

-                    "modelInstanceId": serviceInstanceId,

-                    "requestDetails": {

-                        "modelInfo": {

-                            "modelType": "service",

-                            "modelInvariantId": model.service.invariantUuid,

-                            "modelVersionId": model.service.uuid,

-                            "modelName": model.service.name,

-                            "modelVersion": model.service.version

-                        },

-                        "requestInfo": {

-                            "source": "VID",

-                            "requestorId": userID

-                        },

-                        "requestParameters": {

-                            "userParams": {

-                                "name": "aic_zone",

-                                "value": aicZone

-                            }

-                        }

-                    }

-                };

+    };

 

-                console.log("requestDetails", requestDetails);

+    var activateInstance = function(requestParams) {

+        var requestDetails = buildPayloadForServiceActivateDeactivate(requestParams.model, requestParams.userId, requestParams.aicZone);

 

-                $http.post(COMPONENT.MSO_ACTIVATE_INSTANCE.replace('@serviceInstanceId', requestDetails.modelInstanceId),

-                    requestDetails.requestDetails)

-                    .success(function (response) {

-                        deferred.resolve({data: response});

-                    })

-                    .error(function(data, status, headers, config) {

-                        deferred.reject({message: data, status: status});

-                    });

+        return sendPostRequest(COMPONENT.MSO_ACTIVATE_INSTANCE.replace('@serviceInstanceId', requestParams.instance.serviceInstanceId),

+            requestDetails);

+    };

+

+    var deactivateInstance = function(requestParams) {

+        var requestDetails = buildPayloadForServiceActivateDeactivate(requestParams.model, requestParams.userId, requestParams.aicZone);

+

+        return sendPostRequest(COMPONENT.MSO_DEACTIVATE_INSTANCE.replace('@serviceInstanceId', requestParams.instance.serviceInstanceId),

+            requestDetails);

+    };

+

+    var sendPostRequest = function(url, requestDetails) {

+        var deferred = $q.defer();

+        if (url) {

+            $http.post(url, {

+                requestDetails: requestDetails

+            }, {

+                timeout: PropertyService.getServerResponseTimeoutMsec()

+            }).success(function (response) {

+                deferred.resolve({data: response});

+            }).error(function (data, status) {

+                deferred.reject({message: data, status: status});

             });

-        });

+        }

 

         return deferred.promise;

     };

@@ -177,9 +188,12 @@ var MsoService = function($http, $log, PropertyService, AaiService, UtilityServi
         getFormattedSingleGetOrchestrationRequestResponse : function (response) {

             UtilityService.checkUndefined(COMPONENT.ENTITY, response.data.entity);

             UtilityService.checkUndefined(COMPONENT.STATUS, response.data.status);

-            checkValidStatus(response);

+            //checkValidStatus(response);

 

             var message = "";

+            if (! (response && response.data && response.data.entity)) {

+                return message;

+            }

             if ( UtilityService.hasContents (response.data.entity.request) ) {

                 var request = response.data.entity.request;

                 message += addListEntry(FIELD.ID.REQUEST_ID, request.requestId) + ",\n";

@@ -201,6 +215,11 @@ var MsoService = function($http, $log, PropertyService, AaiService, UtilityServi
                         + "\n\n";

                 }

             }

+            else {

+                if (UtilityService.hasContents(response.data.status) && UtilityService.hasContents(response.data.entity)) {

+                    message = this.getFormattedCommonResponse(response) + "\n";

+                }

+            }

             return message;

         },

         getManualTasks : function(requestId) {

@@ -215,29 +234,37 @@ var MsoService = function($http, $log, PropertyService, AaiService, UtilityServi
                 .catch(UtilityService.runHttpErrorHandler);

         },

         completeTask: function(taskId, taskToComplete) {

-            $log.debug("MsoService:completeTask: taskId: "

-                + taskId);

-            AaiService.getLoggedInUserID(function (response) {

-                var attuid = response.data;

-                var source = "VID";

-                var data = {

-                    requestDetails: {

-                        requestInfo: {

-                            source: source,

-                            responseValue: taskToComplete,

-                            requestorId: attuid

+            var promise = new Promise(function (resolve, reject) {

+                $log.debug("MsoService:completeTask: taskId: "

+                    + taskId);

+                AaiService.getLoggedInUserID(function (response) {

+                    var attuid = response.data;

+                    var source = "VID";

+                    var data = {

+                        requestDetails: {

+                            requestInfo: {

+                                source: source,

+                                responseValue: taskToComplete,

+                                requestorId: attuid

+                            }

                         }

-                    }

-                };

+                    };

 

-                return $http.post(

-                    "mso/mso_post_man_task/" + taskId, data,

-                    {

-                        timeout: PropertyService

-                            .getServerResponseTimeoutMsec()

+                    return $http.post(

+                        "mso/mso_post_man_task/" + taskId, data,

+                        {

+                            timeout: PropertyService

+                                .getServerResponseTimeoutMsec()

+                        }).then(function (response) {

+                            resolve(response);

                     })

-                    .catch(UtilityService.runHttpErrorHandler);

+                        .catch(UtilityService.runHttpErrorHandler);

+                }, function () {

+                    reject();

+                });

             });

+

+            return promise;

         },

         showResponseContentError : function(error, showFunction) {

             switch (error.type) {

@@ -251,9 +278,233 @@ var MsoService = function($http, $log, PropertyService, AaiService, UtilityServi
                     showFunction(FIELD.ERROR.SYSTEM_FAILURE);

             }

         },

-        activateInstance: activateInstance

+        activateInstance: activateInstance,

+        deactivateInstance: deactivateInstance,

+

+

+        createConfigurationInstance: function(requestParams) {

+

+            const modelInfoOf = function (instance) {

+                const modelInfo = {

+                    "modelType": "vnf",

+                    "modelInvariantId": instance.properties['model-invariant-id'],

+                    "modelVersionId": instance.properties['model-version-id'],

+                    "modelName": instance.properties['model-name'],

+                    "modelVersion": instance.properties['model-version'],

+                    "modelCustomizationId": instance.properties['model-customization-id']

+                };

+

+                $log.debug("model info from instance", instance);

+                $log.debug("model info to model", modelInfo);

+

+                return modelInfo

+            };

+

+            var payload = {

+                "requestDetails": {

+                    "modelInfo": {

+                        "modelType": "configuration",

+                        "modelInvariantId": requestParams.configurationModelInfo.modelInvariantId,

+                        "modelVersionId": requestParams.configurationModelInfo.modelNameVersionId,

+                        "modelName": requestParams.configurationModelInfo.modelName, // "Port Mirroring Configuration"

+                        "modelVersion": requestParams.configurationModelInfo.modelVersion,

+                        "modelCustomizationId": requestParams.configurationModelInfo.customizationUuid,

+                        "modelCustomizationName": requestParams.configurationModelInfo.modelCustomizationName

+                    },

+                    "cloudConfiguration": {

+                        // "tenantId": ????

+                        "lcpCloudRegionId": requestParams.portMirroringConfigFields.lcpRegion.value

+                    },

+                    "requestInfo": {

+                        "instanceName": requestParams.portMirroringConfigFields.instanceName.value,

+                        "source": "VID",

+                        "requestorId": requestParams.attuuid

+                    },

+                    "relatedInstanceList": [

+                        {

+                            "relatedInstance": {

+                                "instanceId": requestParams.topServiceInstanceId,

+                                "modelInfo": {

+                                    "modelType": "service", // relatedTopModelsInfo.modelType

+                                    "modelInvariantId": requestParams.relatedTopModelsInfo.modelInvariantId,

+                                    "modelVersionId": requestParams.relatedTopModelsInfo.modelNameVersionId,

+                                    "modelName": requestParams.relatedTopModelsInfo.modelName,

+                                    "modelVersion": requestParams.relatedTopModelsInfo.modelVersion

+                                }

+                            }

+                        },

+                        {

+                            "relatedInstance": {

+                                "instanceId": requestParams.portMirroringConfigFields.sourceInstance.properties['vnf-id'],

+                                "instanceDirection": "source",

+                                "modelInfo": modelInfoOf(requestParams.portMirroringConfigFields.sourceInstance)

+                            }

+                        },

+                        {

+                            "relatedInstance": {

+                                "instanceId": requestParams.configurationByPolicy ?

+                                    requestParams.portMirroringConfigFields.destinationInstance.properties['pnfName']:

+                                    requestParams.portMirroringConfigFields.destinationInstance.properties['vnf-id'],

+                                "instanceDirection": "destination",

+                                "modelInfo":

+                                    requestParams.configurationByPolicy ?

+                                        {"modelType": "pnf"} :

+                                        modelInfoOf(requestParams.portMirroringConfigFields.destinationInstance)

+                            }

+                        }

+                    ],

+                    "requestParameters": {

+                        "userParams": []

+                    }

+                }

+            };

+

+            $log.debug("payload", payload);

+

+            var deferred = $q.defer();

+            $http.post([

+                'mso','mso_create_configuration_instance',

+                requestParams.topServiceInstanceId,

+                'configurations',''

+            ].join(COMPONENT.FORWARD_SLASH),

+                payload)

+                .success(function (response) {

+                    deferred.resolve({data : response});

+                }).error(function (data, status) {

+                deferred.reject({message: data, status: status});

+            });

+            return deferred.promise;

+        },

+

+        toggleConfigurationStatus: function(requestParams) {

+

+            var requestDetails = {

+                "modelInfo": requestParams.configurationModel,

+                "cloudConfiguration": {

+                    "lcpCloudRegionId": "mdt1"

+                },

+                "requestInfo": {

+                    "source": "VID",

+                    "requestorId": requestParams.userId

+                },

+                "relatedInstanceList": [{

+                    "relatedInstance": {

+                        "instanceId": requestParams.serviceInstanceId,

+                        "modelInfo": requestParams.serviceModel

+                    }

+                }],

+                "requestParameters": {

+                    "userParams": []

+                }

+            };

+

+            var url;

+            switch (requestParams.configStatus) {

+                case FIELD.STATUS.AAI_CREATED:

+                case FIELD.STATUS.AAI_INACTIVE:

+                    url = "mso/mso_activate_configuration/"+requestParams.serviceInstanceId+"/configurations/"+requestParams.configurationId;

+                    break;

+                case FIELD.STATUS.AAI_ACTIVE:

+                    url = "mso/mso_deactivate_configuration/"+requestParams.serviceInstanceId+"/configurations/"+requestParams.configurationId;

+                    break;

+            }

+

+            return sendPostRequest(url, requestDetails);

+        },

+

+        togglePortStatus: function(requestParams) {

+            var requestDetails = {

+                "modelInfo": requestParams.configurationModel,

+                "cloudConfiguration": {

+                    "lcpCloudRegionId": "mdt1"

+                },

+                "requestInfo": {

+                    "source": "VID",

+                    "requestorId": requestParams.userId

+                },

+                "relatedInstanceList": [

+                    {

+                        "relatedInstance": {

+                            "instanceId": requestParams.serviceInstanceId,

+                            "modelInfo": requestParams.serviceModel

+                        }

+                    },

+                    {

+                        "relatedInstance": {

+                            "instanceId": requestParams.portId,

+                            "instanceDirection": "source",

+                            "modelInfo": {

+                                "modelType": "connectionPoint"

+                            }

+                        }

+                    }

+                ]

+            };

+

+            var url;

+            switch (requestParams.portStatus) {

+                case FIELD.STATUS.AAI_ENABLED:

+                    url = "mso/mso_disable_port_configuration/"+requestParams.serviceInstanceId+"/configurations/"+requestParams.configurationId;

+                    break;

+                case FIELD.STATUS.AAI_DISABLED:

+                    url = "mso/mso_enable_port_configuration/"+requestParams.serviceInstanceId+"/configurations/"+requestParams.configurationId;

+                    break;

+            }

+

+            return sendPostRequest(url, requestDetails);

+        },

+

+        buildPayloadForAssociateDissociate: function(serviceModelInfo, attuuid, instanceId, pnf) {

+            var payload = {

+                    "modelInfo": {

+                        "modelType": "service",

+                        "modelInvariantId": serviceModelInfo.invariantUuid,

+                        "modelVersionId": serviceModelInfo.uuid,

+                        "modelName": serviceModelInfo.name,

+                        "modelVersion": serviceModelInfo.version

+                    },

+                    "requestInfo": {

+                        "source": "VID",

+                        "requestorId": attuuid

+                    },

+                    "relatedInstanceList": [

+                        {

+                            "relatedInstance": {

+                                "instanceName": pnf,

+                                "modelInfo": {

+                                    "modelType": "pnf"

+                                }

+                            }

+                        }],

+                    "requestParameters": {

+                        "aLaCarte": true

+                    }

+            };

+

+            $log.debug("payload", payload);

+

+            return payload;

+        },

+        associatePnf: function(requestParams) {

+

+            var payload = this.buildPayloadForAssociateDissociate(requestParams.serviceModelInfo, requestParams.attuuid, requestParams.instanceId, requestParams.pnf);

+            return sendPostRequest([

+                    COMPONENT.MSO, COMPONENT.MSO_CREATE_REALATIONSHIP,

+                    requestParams.instanceId,

+                    ''

+                ].join(COMPONENT.FORWARD_SLASH), payload);

+        },

+        dissociatePnf: function(requestParams) {

+

+            var payload = this.buildPayloadForAssociateDissociate(requestParams.serviceModelInfo, requestParams.attuuid, requestParams.serviceInstanceId, requestParams.pnf);

+

+            return sendPostRequest([

+                COMPONENT.MSO, COMPONENT.MSO_REMOVE_RELATIONSHIP,

+                requestParams.serviceInstanceId,

+                ''

+            ].join(COMPONENT.FORWARD_SLASH), payload);

+        }

     }

 };

 

-appDS2.factory("MsoService", [ "$http", "$log", "PropertyService",

-    "AaiService", "UtilityService", "COMPONENT", "FIELD", "$q", MsoService ]);

+appDS2.factory("MsoService", MsoService );