From 1c1e7f98416875f3ee78af9103865c32f95a82a0 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 30 Oct 2018 09:39:59 -0400 Subject: Remove SDNR seed code Remove SDNR seed code to resolve license issues. Code is not currently used, so it will be removed for now and a cleaned version resubmitted for Dublin release. Change-Id: I37ca0feb458012626bf448739ff2497679fcb357 Issue-ID: CCSDK-641 Signed-off-by: Timoney, Dan (dt5972) --- .../ux/mwtnCompare/mwtnCompare-bundle/pom.xml | 118 ----- .../resources/OSGI-INF/blueprint/blueprint.xml | 19 - .../ux/mwtnCompare/mwtnCompare-module/pom.xml | 15 - .../resources/mwtnCompare/images/mwtnCompare.png | Bin 3342 -> 0 bytes .../resources/mwtnCompare/mwtnCompare-custom.css | 36 -- .../mwtnCompare/mwtnCompare.controller.js | 526 --------------------- .../mwtnCompare/mwtnCompare.directives.js | 21 - .../resources/mwtnCompare/mwtnCompare.module.js | 50 -- .../resources/mwtnCompare/mwtnCompare.services.js | 26 - .../resources/mwtnCompare/mwtnCompare.tpl.html | 333 ------------- .../mwtnCompare/templates/compare.tpl.html | 12 - .../code-Carbon-SR1/ux/mwtnCompare/pom.xml | 24 - 12 files changed, 1180 deletions(-) delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-bundle/pom.xml delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/pom.xml delete mode 100755 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/images/mwtnCompare.png delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare-custom.css delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.controller.js delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.directives.js delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.module.js delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.services.js delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.tpl.html delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/templates/compare.tpl.html delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/pom.xml (limited to 'sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare') diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-bundle/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-bundle/pom.xml deleted file mode 100644 index 66e1ee9e..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-bundle/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - 4.0.0 - - mwtnCompare - com.highstreet.technologies.odl.dlux - 0.5.1-SNAPSHOT - - mwtnCompare-bundle - ${prefix} ${project.artifactId} - bundle - - - - org.osgi - org.osgi.core - ${osgi.core.version} - - - org.osgi - org.osgi.compendium - ${osgi.core.version} - - - org.apache.felix - org.osgi.compendium - ${apache.felix.compendium} - - - org.opendaylight.dlux - loader - ${dlux.loader.version} - - - com.highstreet.technologies.odl.dlux - mwtnCompare-module - 0.5.1-SNAPSHOT - - - - - - target/generated-resources - - - src/main/resources - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.6 - - - - unpack-loader-resources - - unpack-dependencies - - generate-resources - - ${project.build.directory}/generated-resources - com.highstreet.technologies.odl.dlux - mwtnCompare-module - META-INF\/** - true - false - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.osgi.service.http, - org.osgi.framework;version="1.0.0", - org.opendaylight.dlux.loader - - - - - - - - - - - diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index dae4aa40..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - src/app/mwtnCompare/mwtnCompare-custom.css - - - - \ No newline at end of file diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/pom.xml deleted file mode 100644 index c0de516d..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - mwtnCompare - com.highstreet.technologies.odl.dlux - 0.5.1-SNAPSHOT - - mwtnCompare-module - ${prefix} ${project.artifactId} - jar - - \ No newline at end of file diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/images/mwtnCompare.png b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/images/mwtnCompare.png deleted file mode 100755 index f4f9c096..00000000 Binary files a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/images/mwtnCompare.png and /dev/null differ diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare-custom.css b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare-custom.css deleted file mode 100644 index 1cab6029..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare-custom.css +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Add your application related css here - * Build: @buildtime@ - */ - -#mwtnCompare .footable > thead > tr > th { - background-color: #428bca; - color: #ffffff; - background-image: none; - border: none; - box-shadow: none; -} - -.connected { - color: lightgreen; -} - -.connected span { - color: lightgreen; -} - -.match { - color: lightgreen; -} - -.match span { - color: lightgreen; -} - -.nowrap { - white-space: nowrap; -} - -.red { - color: red; -} \ No newline at end of file diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.controller.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.controller.js deleted file mode 100644 index e83885a6..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.controller.js +++ /dev/null @@ -1,526 +0,0 @@ -/* - * Copyright (c) 2017 highstreet technologies GmbH and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -define(['app/mwtnCompare/mwtnCompare.module', - 'app/mwtnCompare/mwtnCompare.services', - 'app/mwtnCommons/mwtnCommons.services', - 'app/mwtnCompare/mwtnCompare.directives', - 'app/mwtnCommons/bower_components/angular-ui-grid/ui-grid.min'], function(mwtnCompareApp) { - - mwtnCompareApp.register.controller('mwtnCompareCtrl', ['$scope', '$rootScope', '$mwtnCompare', '$mwtnLog', 'orderByFilter', 'OnfNetworkElement', 'MicrowavePhysicalSection', 'MicrowaveSection', - function($scope, $rootScope, $mwtnCompare, $mwtnLog, orderBy, OnfNetworkElement, MicrowavePhysicalSection, MicrowaveSection) { - - $rootScope.section_logo = 'src/app/mwtnCompare/images/mwtnCompare.png'; // Add your topbar logo location here such as 'assets/images/logo_topology.gif' - - var rOnfNe; - var aOnfNe; - - $scope.status = {ne:false}; - $scope.spinner = {ne:false}; - $scope.separator = $mwtnCompare.separator; //' ' - $scope.connectionStatus = 'disconnected'; - $scope.oneATime = true; - $scope.match = { - numberOfLTPs: false, - numberOfLTPsStatus: 'unknown', - radioSignalIds: false, - radioSignalIdsStatus: 'unknown', - mapping: {}, - addActualRadioSignalId: function(rsId) { - if (!this.actualRadioSignalIds) { - this.actualRadioSignalIds = []; - } - if (this.actualRadioSignalIds.contains(rsId)) { - return; - } - this.actualRadioSignalIds.push(rsId); - this.actualRadioSignalIds.sort(); - this.checkRadioSignalIdsStatus(); - }, - clearActualNumberOfLtps: function() { - this.actualNumberOfLtps = undefined; - this.numberOfLTPs = false; - this.numberOfLTPsStatus = this.requiredNumberOfLtps; - }, - clearActualRadioSignalIds: function() { - this.actualRadioSignalIds = undefined; - this.radioSignalIds = false; - this.radioSignalIdsStatus = this.requiredRadioSignalIds; - }, - setRequiredNumberOfLtps: function(rNoLtps) { - this.requiredNumberOfLtps = rNoLtps; - this.checkNumberOfLTPs(); - }, - setRequiredRadioSignalIds: function(rRsIds) { - this.requiredRadioSignalIds = rRsIds.sort(); - this.checkRadioSignalIdsStatus(); - }, - setActualNumberOfLtps: function(aNoLtps) { - this.actualNumberOfLtps = aNoLtps; - this.checkNumberOfLTPs(); - }, - setActualRadioSignalIds: function(aRsIds) { - this.actualRadioSignalIds = aRsIds.sort(); - this.checkRadioSignalIdsStatus(); - }, - checkNumberOfLTPs: function() { - if (!this.requiredNumberOfLtps) { - this.numberOfLTPs = false; - this.numberOfLTPsStatus = 'unknown'; - } else { - if (!this.actualNumberOfLtps) { - this.numberOfLTPs = false; - this.numberOfLTPsStatus = this.requiredNumberOfLtps; - } else { - if (this.requiredNumberOfLtps === this.actualNumberOfLtps) { - this.numberOfLTPs = true; - this.numberOfLTPsStatus = this.requiredNumberOfLtps; - } else { - this.numberOfLTPs = false; - this.numberOfLTPsStatus = ['required:', this.requiredNumberOfLtps, 'does not match actual:',this.actualNumberOfLtps].join(' '); - } - } - } - }, - checkRadioSignalIdsStatus: function() { - if (!this.requiredRadioSignalIds) { - this.radioSignalIds = false; - this.radioSignalIdsStatus = 'unknown'; - } else { - if (!this.actualRadioSignalIds) { - this.radioSignalIds = false; - this.radioSignalIdsStatus = this.requiredRadioSignalIds; - } else { - if (JSON.stringify(this.requiredRadioSignalIds) === JSON.stringify(this.actualRadioSignalIds)) { - this.radioSignalIds = true; - this.radioSignalIdsStatus = this.requiredRadioSignalIds; - } else { - this.radioSignalIds = false; - this.radioSignalIdsStatus = ['required:', this.requiredRadioSignalIds, 'does not match actual:',this.actualRadioSignalIds].join(' '); - } - } - } - } - - }; - - $scope.schema = {initShowObjectCtrl:false}; - $mwtnCompare.getSchema().then(function(data){ - $scope.schema = data; - }); - - var initNodeList = function(nodes){ - $scope.neSelection = []; - if (nodes.length > 0) { - nodes.map(function(ne) { - if (ne._source.onfAirInterfaceRevision) { - $scope.neSelection.push({id:ne._id, revision:ne._source.onfAirInterfaceRevision}); - - } - }); - $scope.neSelection.sort(function(a, b){ - if(a.id < b.id) return -1; - if(a.id > b.id) return 1; - return 0; - }); - } - }; - $scope.requiredNetworkElements = []; - $mwtnCompare.getRequiredNetworkElements(true).then(function(nodes){ - $scope.requiredNetworkElements = nodes; - initNodeList(nodes); - }, function(error){ - $scope.neSelection = []; - $scope.requiredNetworkElements = []; - }); - - $scope.collapseAll = function() { - // close all groups - Object.keys($scope.status).map(function(group){ - $scope.status[group] = false; - }); - Object.keys($scope.spinner).map(function(group){ - $scope.spinner[group] = false; - }); - }; - - - // events - $scope.$watch('selection', function(neId, oldValue) { - if (neId && neId !== '' && neId !== oldValue) { - $scope.collapseAll(); - $scope.connectionStatus = 'disconnected'; - $scope.match.clearActualNumberOfLtps(); - $scope.match.clearActualRadioSignalIds(); - $mwtnCompare.getConnectionStatus(neId).then(function(connectionStatus){ - $scope.connectionStatus = connectionStatus; - // get actual data - if ($scope.connectionStatus === 'connected') { - var key = 'ne'; - var spec = { - nodeId: $scope.selection, - revision: $scope.requiredNetworkElement.onfAirInterfaceRevision, - pacId: key, - }; - $mwtnCompare.getPacParts(spec).then(function(success){ - updatePart(spec, success); - $scope.spinner[key] = false; - }, function(error){ - updatePart(spec, error); - $scope.spinner[key] = false; - }); - } - - },function(error){ - $scope.connectionStatus = 'disconnected'; - }); - - $scope.requiredNetworkElements.map(function(rne){ - console.warn(JSON.stringify(rne._id, neId, rne._id === neId)); - if (rne._id === neId) { - $scope.requiredNetworkElement = rne._source; - rOnfNe = new OnfNetworkElement(rne._source['core-model:network-element']); - $scope.match.setRequiredNumberOfLtps(rOnfNe.getNumberOfLtps()); - // required NE - var rMwpsList = rOnfNe.getLTPMwpsList().map(function(mwpsLtp){ - var key = 'microwave-model:mw-air-interface-pac'; - if ($scope.requiredNetworkElement.onfAirInterfaceRevision.contains('2016')) { - key = 'MicrowaveModel-ObjectClasses-AirInterface:MW_AirInterface_Pac'; - } - var rMwpsList = $scope.requiredNetworkElement[key].map(function(mwps){ - if (mwps.layerProtocol === mwpsLtp.getLayerProtocols()[0].getId()) { - return new MicrowavePhysicalSection(mwps); - } - }); - - if (rMwpsList) { - return rMwpsList.clean(undefined)[0]; - } else { - return {}; - } - }); - - var rRadioSignalIds = rMwpsList.map(function(rMwps){ - return rMwps.getRadioSignalId(); - }); - $scope.match.setRequiredRadioSignalIds(rRadioSignalIds); - } - }); - } - }); - - var getArrayValueToHtml = function(array) { - if (array === undefined) { - return ''; - } - if (array.length > 0 && ($mwtnCompare.getType(array[0]) === 'object' || $mwtnCompare.getType(array[0]) === 'array') ) { - var converted = array.map(function(item){ - if ($mwtnCompare.getType(item) === 'object' && Object.keys(item).length === 2 ) { - return [item[Object.keys(item)[0]], item[Object.keys(item)[1]]].join(':'); - } else { - return JSON.stringify(item); - } - }); - return converted.join('
'); - } else { - return array.join('
'); - } - }; - - var getCompares = function(obj, actualData) { - var compares = []; - - for (var labelId in obj) { - var missingActualValueLabelId = 'not connected'; - var match = false; - - switch (labelId) { - case 'compares': - break; - case 'open': - break; -// case 'nameList': -// var requiredName = obj[labelId][0].value; -// var actualName = ''; -// if (actualData) { -// actualName = actualData[labelId][0].value; -// } -// match = ((requiredName === '' || actualName === '') || (requiredName === actualName)); -// // console.log('NAME', requiredName, actualName, match); -// compares.push({ -// labelId : 'NE name', -// requiredValue : requiredName, -// actualValue : actualName, -// match : match, -// missingActualValueLabelId : missingActualValueLabelId, -//// unit : $scope.schema[labelId].unit, -//// description : $scope.schema[labelId].description, -// showDescriptions : false -// }); -// break; - case '_ltpRefList': - var requiredLtpLength = obj[labelId].length; - var actualLtpLength = ''; - if (actualData) { - actualLtpLength = actualData[labelId].length; - } - match = ((requiredLtpLength === '' || actualLtpLength === '') || (requiredLtpLength === actualLtpLength)); - compares.push({ - labelId : 'numberOfLTPs', - requiredValue : requiredLtpLength, - actualValue : actualLtpLength, - match : match, - missingActualValueLabelId : missingActualValueLabelId, - unit : $scope.schema[labelId].unit, - order: $scope.schema[labelId]['order-number'], - description : $scope.schema[labelId].description, - showDescriptions : false - }); - break; - default: - if (labelId === 'installedCapacity') { - missingActualValueLabelId = ''; - } - if (labelId === 'timeSlotIDList') { - var requiredTimeSlotIDListLength = obj[labelId].length; - var actualTimeSlotIDListLength = ''; - if (actualData) { - actualTimeSlotIDListLength = actualData[labelId].length; - } - compares.push({ - labelId : 'currentNumberOfTimeSlots', - requiredValue : requiredTimeSlotIDListLength, - actualValue : actualTimeSlotIDListLength, - match : true, - missingActualValueLabelId : missingActualValueLabelId, - unit : $scope.schema[labelId].unit, - order: $scope.schema[labelId]['order-number'], - description : $scope.schema[labelId].description, - showDescriptions : false - }); - } - - switch($mwtnCompare.getType(obj[labelId])) { - case 'object': - if (actualData) { - var withActual = getCompares(obj[labelId], actualData[labelId]); - compares = compares.concat(withActual); - } else { - var withoutActual = getCompares(obj[labelId]); - compares = compares.concat(withoutActual); - } - break; - case 'array': - var requiredDataValue = getArrayValueToHtml(obj[labelId]); - var actualDataValue = ''; - if (actualData) { - actualDataValue = getArrayValueToHtml(actualData[labelId]); - } - match = ((requiredDataValue === '' || actualDataValue === '') || (requiredDataValue === actualDataValue)); - compares.push({ - labelId : labelId, - requiredValue : requiredDataValue, - actualValue : actualDataValue, - match : match, - missingActualValueLabelId : missingActualValueLabelId, - unit : $scope.schema[labelId].unit, - order: $scope.schema[labelId]['order-number'], - description : $scope.schema[labelId].description, - showDescriptions : false - }); - break; - default: - var requiredValue = obj[labelId]; - var actualValue = actualData ? actualData[labelId] : ''; -// // console.log('match'); -// // console.log('match1', requiredValue, (requiredValue === '')); -// // console.log('match2', actualValue, (actualValue === '')); -// // console.log('match3', requiredValue, actualValue, (requiredValue === actualValue)); -// // console.log('match4', (requiredValue === '' || actualValue === '') || (requiredValue === actualValue)); - match = (requiredValue === '' || actualValue === '') || (requiredValue === actualValue); - compares.push({ - labelId : labelId, - requiredValue : requiredValue, - actualValue : actualValue, - match : match, - missingActualValueLabelId : missingActualValueLabelId, - unit : $scope.schema[labelId].unit, - order: $scope.schema[labelId]['order-number'], - description : $scope.schema[labelId].description, - showDescriptions : false - }); - } - } - } - return orderBy(compares, 'order', false); - }; - - var updateNe = function(data) { - - var rne = $scope.requiredNetworkElement; - if (!data) { - rne['core-model:network-element'].compares = getCompares(rne['core-model:network-element']); - return; - } - rne['core-model:network-element'].compares = getCompares(rne['core-model:network-element'], data['core-model:network-element']); - console.error(JSON.stringify(data)); - aOnfNe = new OnfNetworkElement(data['core-model:network-element']); - $scope.match.setActualNumberOfLtps(aOnfNe.getNumberOfLtps()); - var aMwpsList = aOnfNe.getLTPMwpsList().map(function(mwpsLtp){ - - var spec = { - nodeId: $scope.selection, - revision: $scope.requiredNetworkElement.onfAirInterfaceRevision, - pacId: 'microwave-model:mw-air-interface-pac', - layerProtocolId: mwpsLtp.getLayerProtocols()[0].getId(), - partId: 'configuration' - }; - - $mwtnCompare.getPacParts(spec).then(function(success){ - updatePart(spec, success); - }, function(error){ - updatePart(spec, error); - }); - return mwpsLtp._lpList[0].uuid; - }); - // console.log(aMwpsList) - var mwClient = rne['microwave-model:mw-ethernet-container-pac'][0]; - $scope.match.mapping[mwClient.layerProtocol] = aOnfNe.getLTPEthCtpList()[0].getLayerProtocols()[0].getId(); - }; - - var addShowDescriptionEvent = function(obj) { - $scope.$watch(function() { - return obj.showDescriptions; - }, function(newValue, oldValue) { - if (newValue !== oldValue) { - obj.compares.map(function(compare){ - compare.showDescriptions = newValue; - }); - } - }); - }; - - var updateAirInterface = function(spec, data) { - if (!data) { - $scope.requiredNetworkElement['microwave-model:mw-air-interface-pac'].map(function(mwps){ - mwps.compares = getCompares(mwps.airInterfaceConfiguration); - addShowDescriptionEvent(mwps); - }); - } else { - var actual = new MicrowavePhysicalSection(data); - $scope.match.addActualRadioSignalId(actual.getRadioSignalId()); - // console.log(actual.getRadioSignalId()); - $scope.requiredNetworkElement['microwave-model:mw-air-interface-pac'].map(function(mwps){ - var required = new MicrowavePhysicalSection(mwps); - if (actual.getRadioSignalId() === required.getRadioSignalId()) { - $scope.match.mapping[required.getLayerProtocolId()] = actual.getLayerProtocolId(); - var actualData = data.airInterfaceConfiguration; - mwps.compares = getCompares(mwps.airInterfaceConfiguration, actualData); - addShowDescriptionEvent(mwps); - - // MWS mapping - var rMws = rOnfNe.getClientLtpIds(required.getLayerProtocolId()); - var aMws = aOnfNe.getClientLtpIds(actual.getLayerProtocolId()); - // In PoC just a 1:1 relation between MWPS and MWS - $scope.match.mapping[rOnfNe.getLpByLtpRef(rMws[0]).uuid] = aOnfNe.getLpByLtpRef(aMws[0]).uuid; - } - }); - } - }; - - var updateStructure = function(spec, data) { - if (!data) { - $scope.requiredNetworkElement.MW_PureEthernetStructure_Pac.map(function(mws){ - mws.compares = getCompares(mws.pureEthernetStructureConfiguration); - addShowDescriptionEvent(mws); - }); - } else { - $scope.requiredNetworkElement.MW_PureEthernetStructure_Pac.map(function(mws){ - if ($scope.match.mapping[mws.layerProtocol] === data.layerProtocol) { - var actualData = data.pureEthernetStructureConfiguration; - mws.compares = getCompares(mws.pureEthernetStructureConfiguration, actualData); - addShowDescriptionEvent(mws); - } - }); - } - }; - - var updateContainer = function(spec, data) { - // there is only one container in PoCs - var mwClient = $scope.requiredNetworkElement.MW_EthernetContainer_Pac[0]; - if (!data) { - mwClient.compares = getCompares(mwClient.ethernetContainerConfiguration); - addShowDescriptionEvent(mwClient); - } else { - var actualData = data.ethernetContainerConfiguration; - mwClient.compares = getCompares(mwClient.ethernetContainerConfiguration, actualData); - addShowDescriptionEvent(mwClient); - } - }; - - var updatePart = function(spec, data) { - switch (spec.pacId) { - case 'ne': - updateNe(data); - break; - case 'airinterface': - // console.log(JSON.stringify(spec, JSON.stringify(data))); - updateAirInterface(spec, data); - break; - case 'structure': - // console.log(JSON.stringify(data)); - updateStructure(spec, data); - break; - case 'container': - // console.log(JSON.stringify(data)); - updateContainer(spec, data); - break; - } - }; - - $scope.$watch('status', function(status, oldValue) { - Object.keys(status).map(function(key){ - if ($scope.selection && status[key] && status[key] !== oldValue[key]) { - var info = key.split($scope.separator); - var spec = { - nodeId: $scope.selection, - revision: $scope.requiredNetworkElement.onfAirInterfaceRevision, - pacId: info[0], - requiredLayerProtocolId: info[1], - layerProtocolId: $scope.match.mapping[info[1]], - partId: 'Configuration' - }; - - if ($scope.connectionStatus !== 'connected') { - updatePart(spec, undefined); - return; - } - if (info.length > 1 && !$scope.match.mapping[info[1]]) { - updatePart(spec, undefined); - return; - } - - $scope.spinner[key] = true; - $mwtnCompare.getPacParts(spec).then(function(success){ - updatePart(spec, success); - $scope.spinner[key] = false; - }, function(error){ - updatePart(spec, error); - $scope.spinner[key] = false; - }); - - } - }); - }, true); - - - - }]); - - -}); diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.directives.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.directives.js deleted file mode 100644 index f5fadd77..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.directives.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2016 highstreet technologies GmbH and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -define([ 'app/mwtnCompare/mwtnCompare.module' ], function(mwtnCompareApp) { - - mwtnCompareApp.register.directive('compare', function() { - return { - restrict : 'A', - scope: { - item: '=compare' - }, - templateUrl : 'src/app/mwtnCompare/templates/compare.tpl.html' - }; - }); - -}); \ No newline at end of file diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.module.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.module.js deleted file mode 100644 index e3761f36..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.module.js +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2016 highstreet technologies GmbH and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -define(['angularAMD', 'app/routingConfig', 'app/core/core.services', 'common/config/env.module'], function(ng) { - var mwtnCompareApp = angular.module('app.mwtnCompare', ['app.core', 'ui.router.state','config', 'pascalprecht.translate']); - - mwtnCompareApp.config(function($stateProvider, $compileProvider, $controllerProvider, $provide, NavHelperProvider, $translateProvider) { - mwtnCompareApp.register = { - controller : $controllerProvider.register, - directive : $compileProvider.directive, - factory : $provide.factory, - service : $provide.service - - }; - - - NavHelperProvider.addControllerUrl('app/mwtnCompare/mwtnCompare.controller'); - NavHelperProvider.addToMenu('mwtnCompare', { - "link" : "#/pnfCompare/", - "active" : "main.mwtnCompare", - "title" : "pnf Compare", - "icon" : "fa fa-tags", // Add navigation icon css class here - "page" : { - "title" : "pnf Compare", - "description" : "mwtnCompare" - } - }); - - var access = routingConfig.accessLevels; - - $stateProvider.state('main.mwtnCompare', { - url: 'pnfCompare/:nodeId', - access: access.admin, - views : { - 'content' : { - templateUrl: 'src/app/mwtnCompare/mwtnCompare.tpl.html', - controller: 'mwtnCompareCtrl' - } - } - }); - - }); - - return mwtnCompareApp; -}); diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.services.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.services.js deleted file mode 100644 index 9a133e3b..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.services.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2016 highstreet technologies GmbH and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -define(['app/mwtnCompare/mwtnCompare.module'],function(mwtnCompareApp) { - - mwtnCompareApp.register.factory('$mwtnCompare', function($mwtnCommons, $mwtnDatabase) { - - var service = {}; - - service.getConnectionStatus = $mwtnCommons.getConnectionStatus; - service.getPacParts = $mwtnCommons.getPacParts; - service.getRequiredNetworkElements = $mwtnCommons.getRequiredNetworkElements; - service.getSchema = $mwtnDatabase.getSchema; - service.getType = $mwtnCommons.getType; - service.separator = $mwtnCommons.separator; - - - return service; - }); - -}); diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.tpl.html b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.tpl.html deleted file mode 100644 index b3601ec2..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/mwtnCompare.tpl.html +++ /dev/null @@ -1,333 +0,0 @@ - -
-
-
-

- {{ 'MWTN_NO_DEVICES_CONNECTED' | translate }} - Please check - - MWTN Connect - - . -

-
-
-
- {{'Select planned NetworkElement' | translate}} -
-
-
- - - - - - -
-
-
- {{'MWTN_CONNECTIONSTATUS' | translate}}:
- {{'MWTN_NUMBEROFLTPS' | translate}}:
- {{'MWTN_RADIOSIGNALIDS' | translate}}: -
-
- - - {{connectionStatus}} -
- - {{match.numberOfLTPsStatus}}
- - {{match.radioSignalIdsStatus}} -
-
-
- -
-
- -
-
-
-
-
-
- - -
- - - {{'MWTN_NETWORKELEMENT' | translate}} '{{requiredNetworkElement['core-model:network-element'].nameList[0].value}}' - - -
{{requiredNetworkElement | json}}
- - - - - - -
- - - - - - - - - - - - - -
{{ 'Label' | translate }}{{ 'Required value' | translate }}{{ 'Actual value' | translate }}{{ 'Unit' | translate }}{{ 'Description' | translate }}
- 		-

- NetworkElement -

-

{{ schema['NetworkElement'].description }}

-
-
- -
- - - AirInterface MWPS '{{mwps.layerProtocol}}' - - - -
- - Hide - Show - descriptions - -
- - - - - - - - -
-
-

- {{item}} -

- {{schema[item].description}} -
- 		-

- AirInterfaceConfiguration -

- {{schema['AirInterfaceConfiguration'].description}} -
- - - - - - - - - - - - - - - - - - - - -
{{ 'Label' | translate }}{{ 'Required value' | translate }}{{ 'Actual value' | translate }}{{ 'Unit' | translate }}{{ 'Description' | translate }}
- - -
- -
- -
- - - Structure MWS '{{mws.layerProtocol}}' - - - -
- - Hide - Show - descriptions - -
- - - - - - - - -
-
-

- {{item}} -

- {{schema[item].description}} -
- 		-

- PureEthernetStructureConfiguration -

- {{schema['PureEthernetStructureConfiguration'].description}} -
- - - - - - - - - - - - - - - - - - -
{{ 'Label' | translate }}{{ 'Required value' | translate }}{{ 'Actual value' | translate }}{{ 'Unit' | translate }}{{ 'Description' | translate }}
- - -
-
- -
- - - Container ETH '{{mwClient.layerProtocol}}' - - - -
- - Hide - Show - descriptions - -
- - - - - -
-
-

- {{item}} -

- {{schema[item].description}} -
- 		-
-

- {{item}} -

- {{schema[item].description}} -
-
- - - - - - - - - - - - - - - - - - - -
{{ 'Label' | translate }}{{ 'Required value' | translate }}{{ 'Actual value' | translate }}{{ 'Unit' | translate }}{{ 'Description' | translate }}
- - -
-
- - -
-
-
- -
-
- -
- - Network element: "{{ne.name}}" - -
- - - {{ 'Network element' | translate}} - -1 - - - -
- - LTP ({{mwps.layerProtocol}}) - - - -
-
- - LTP ({{mws.layerProtocol}}) - - - -
-
- - LTP ({{mwClient.layerProtocol}}) - -
- -
-
-
-
-
- ONAP SDN-R | ONF Wireless for @distversion@ - Build: @buildtime@ -
\ No newline at end of file diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/templates/compare.tpl.html b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/templates/compare.tpl.html deleted file mode 100644 index c5cbc50a..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/mwtnCompare-module/src/main/resources/mwtnCompare/templates/compare.tpl.html +++ /dev/null @@ -1,12 +0,0 @@ -{{['mwtn', item.labelId].join('_').toUpperCase() | translate}} - - - - - - -{{ item.unit }} - - {{item.description}} - \ No newline at end of file diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/pom.xml deleted file mode 100644 index 75cedab1..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/mwtnCompare/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - mwtn - com.highstreet.technologies.odl.dlux - 0.5.1-SNAPSHOT - - pom - com.highstreet.technologies.odl.dlux - mwtnCompare - 0.5.1-SNAPSHOT - ${prefix} ${project.artifactId} - - - 3.0 - - - - mwtnCompare-module - mwtnCompare-bundle - - \ No newline at end of file -- cgit 1.2.3-korg