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/onapSo/onapSo-bundle/pom.xml | 115 --------------- .../resources/OSGI-INF/blueprint/blueprint.xml | 19 --- .../ux/onapSo/onapSo-module/pom.xml | 14 -- .../onapSo/images/onap-end-to-end-slicing.png | Bin 115927 -> 0 bytes .../src/main/resources/onapSo/images/onapSo.png | Bin 12003 -> 0 bytes .../src/main/resources/onapSo/onapSo-custom.css | 78 ---------- .../src/main/resources/onapSo/onapSo.controller.js | 84 ----------- .../src/main/resources/onapSo/onapSo.module.js | 56 ------- .../src/main/resources/onapSo/onapSo.services.js | 162 --------------------- .../src/main/resources/onapSo/onapSo.tpl.html | 103 ------------- .../code-Carbon-SR1/ux/onapSo/pom.xml | 24 --- 11 files changed, 655 deletions(-) delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-bundle/pom.xml delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/pom.xml delete mode 100755 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/images/onap-end-to-end-slicing.png delete mode 100755 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/images/onapSo.png delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo-custom.css delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.controller.js delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.module.js delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.services.js delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.tpl.html delete mode 100644 sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/pom.xml (limited to 'sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo') diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-bundle/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-bundle/pom.xml deleted file mode 100644 index dd43c81d..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-bundle/pom.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - 4.0.0 - - onapSo - com.highstreet.technologies.odl.dlux - 0.5.1-SNAPSHOT - - onapSo-bundle - bundle - ${prefix} ${project.artifactId} - - - 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 - onapSo-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 - onapSo-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/onapSo/onapSo-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index e44af850..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - src/app/onapSo/onapSo-custom.css - - - - \ No newline at end of file diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/pom.xml deleted file mode 100644 index f5d04d8f..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - onapSo - com.highstreet.technologies.odl.dlux - 0.5.1-SNAPSHOT - - onapSo-module - ${prefix} ${project.artifactId} - jar - \ No newline at end of file diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/images/onap-end-to-end-slicing.png b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/images/onap-end-to-end-slicing.png deleted file mode 100755 index c798dc1a..00000000 Binary files a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/images/onap-end-to-end-slicing.png and /dev/null differ diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/images/onapSo.png b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/images/onapSo.png deleted file mode 100755 index f2a595f3..00000000 Binary files a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/images/onapSo.png and /dev/null differ diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo-custom.css b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo-custom.css deleted file mode 100644 index f2aaeb7b..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo-custom.css +++ /dev/null @@ -1,78 +0,0 @@ -/** - * Add your application related css here - */ - - .app-onapSo * { - box-sizing: border-box; -} - -.app-onapSo .col { -height: 70px; -width: 12.5%; -float: left; -padding: 15px; -} - -.app-onapSo .row::after { - content: ""; - clear: both; - display: table; -} - - - -.onapSoGrid { - height: 600px; - background-color: white; -} - -.onapSoGrid span { - color: #393939; -} -.ht-pagination span { - color: #393939; -} -.ht-pagination span.dark { - color: #393939; -} -.dark { - color: #393939; -} - - - -.onapSoGrid div.debug { - color: #393939; - background-color: white; -} -.onapSoGrid div.error { - color: #ff0000; - background-color: #ffeeee; - font-weight: bold; -} - -.onapSoGrid div.info { - color: #3276b1; - background-color: #eeeeff; -} - -.onapSoGrid div.warning { - color: #ffa500; - background-color: #ffeedd; -} - -.rotated { - transform: rotate(180deg); - -webkit-transform: rotate(180deg); - -ms-transform: rotate(180deg); - -moz-transform: rotate(180deg); - -o-transform: rotate(180deg); -} - -h3.modal-title { - color: #393939; -} - -.modal-body span { - color: #393939; -} \ No newline at end of file diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.controller.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.controller.js deleted file mode 100644 index cb07fc78..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.controller.js +++ /dev/null @@ -1,84 +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/onapSo/onapSo.module', - 'app/onapSo/onapSo.services'], - function (onapSoApp) { - - onapSoApp.register.controller('onapSoCtrl', ['uiGridConstants', '$uibModal', '$scope', '$rootScope', '$window', '$timeout', '$onapSo', '$mwtnLog', - function (uiGridConstants, $uibModal, $scope, $rootScope, $window, $timeout, $onapSo, $mwtnLog) { - - var COMPONENT = 'onapSoCtrl'; - $mwtnLog.info({ component: COMPONENT, message: 'onapSoCtrl started!' }); - - $rootScope.section_logo = 'src/app/onapSo/images/onapSo.png'; // Add your topbar logo location here such as 'assets/images/logo_topology.gif' - - $scope.highlightFilteredHeader = $onapSo.highlightFilteredHeader; - - $scope.pnf = { - pnfName: { id: 'pnfName', labelId: 'PNF_NAME', value: 'New-PNF' }, - pnfId: { id: 'pnfId', labelId: 'PNF_IDENTIFIER', value: 'New-PNF network unique identifier' }, - equipType: { id: 'equipType', labelId: 'PNF_EQUIPMENT_TYPE', value: 'Fancy equipment type' }, - equipModel: { id: 'equipModel', labelId: 'PNF_EQUIPMENT_MODEL', value: 'Best in class' }, - equipVendor: { id: 'equipVendor', labelId: 'PNF_EQUIPMENT_VENDOR', value: 'ONAP SDN-R Community' }, - ipaddressV4Oam: { id: 'ipaddressV4Oam', labelId: 'PNF_IPv4ADDRESS', value: '10.10.10.10' }, - inMaintenance: { id: 'inMaintenance', labelId: 'PNF_MAINTENANCE_MODE', value: false }, - resourceVersion: { id: 'resourceVersion', labelId: 'PNF_RESOURCE_VERSION', value: '' } - } - - $scope.createPnfInAai = function () { - - var data = { - "pnf-name": $scope.pnf.pnfName.value, - "pnf-id": $scope.pnf.pnfId.value, - "equip-type": $scope.pnf.equipType.value, - "equip-model": $scope.pnf.equipModel.value, - "equip-vendor": $scope.pnf.equipVendor.value, - "ipaddress-v4-oam": $scope.pnf.ipaddressV4Oam.value, - "in-maint": $scope.pnf.inMaintenance.value - } - - $onapSo.createPnf(data).then(function (response) { - console.info('successfully created: ', data['pnf-name']); - $onapSo.getPnf(data).then(function (success) { - // console.info('success', JSON.stringify(success.data)); - $scope.pnf.resourceVersion.value = success.data['resource-version']; - }, function (error) { - console.log('error1', JSON.stringify(error.data)); - $scope.error = error; - }); - }, function (error) { - console.log('error2', JSON.stringify(error.data)); - $scope.error = error; - }); - } - - $scope.deletePnfInAai = function () { - var data = { - "pnf-name": $scope.pnf.pnfName.value, - } - $onapSo.getPnf(data).then(function (success) { - console.info('success', JSON.stringify(success.data)); - $scope.pnf.resourceVersion.value = success.data['resource-version']; - data['resource-version'] = success.data['resource-version']; - $onapSo.deletePnf(data).then(function (success) { - console.info('success', JSON.stringify(success)); - $scope.pnf.resourceVersion.value = success.data['resource-version']; - }, function (error) { - console.log('error', JSON.stringify(error.data)); - $scope.error = error; - }); - }, function (error) { - console.log('error', JSON.stringify(error.data)); - $scope.error = error; - }); - } - - }]); - - }); diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.module.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.module.js deleted file mode 100644 index b2bfec44..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.module.js +++ /dev/null @@ -1,56 +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', - 'app/mwtnCommons/mwtnCommons.module'], function(ng) { - var onapSoApp = angular.module('app.onapSo', ['ui.grid', 'ui.bootstrap', 'app.core', - 'ui.router.state', 'config', 'ui.grid.exporter', - 'ui.grid.moveColumns', 'ui.grid.pinning', 'ui.grid.selection', - 'ui.grid.resizeColumns', 'ui.grid.infiniteScroll','ui.grid.pagination' ]); - - onapSoApp.config(function($stateProvider, $compileProvider, $controllerProvider, $provide, NavHelperProvider, $translateProvider) { - onapSoApp.register = { - controller : $controllerProvider.register, - directive : $compileProvider.directive, - factory : $provide.factory, - service : $provide.service - }; - - - NavHelperProvider.addControllerUrl('app/onapSo/onapSo.controller'); - NavHelperProvider.addToMenu('onapSo', { - "link" : "#/onapSo/", - "active" : "main.onapSo", - "title" : "ONAP SO", - "icon" : "fa fa-music", // Add navigation icon css class here - "page" : { - "title" : "ONAP SO", - "description" : "Open Network Automation Platform (ONAP) - Master Service Orchestrator (MSO)" - } - }); - - var access = routingConfig.accessLevels; - - $stateProvider.state('main.onapSo', { - url: 'onapSo/:nodeId', - access: access.admin, - views : { - 'content' : { - templateUrl: 'src/app/onapSo/onapSo.tpl.html', - controller: 'onapSoCtrl' - } - } - }); - - }); - - return onapSoApp; -}); diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.services.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.services.js deleted file mode 100644 index 3e14e7c2..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.services.js +++ /dev/null @@ -1,162 +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/onapSo/onapSo.module', 'app/mwtnCommons/mwtnCommons.services'], function (onapSoApp) { - - onapSoApp.register.factory('$onapSo', function ($q, $http, Base64, $mwtnCommons, $mwtnDatabase, $mwtnLog, Device) { - - var service = {}; - - var functionId = "mwtn"; - var docType = "device"; - var from = 0; - var size = 9999; - var sort = undefined; - var deviceLookup = {}; - $mwtnDatabase.getAllData(functionId, docType, from, size, sort).then( - function successCallback(response) { - response.data.hits.hits.map(function(device){ - deviceLookup[device._id] = new Device(device._source); - }); - }, function errorCallback(response) { - deviceLookup = {}; - }); - - service.checkModules = $mwtnCommons.checkModules; - service.getMwtnWebSocketUrl = $mwtnCommons.getMwtnWebSocketUrl; - service.gridOptions = $mwtnCommons.gridOptions; - service.formatData = $mwtnCommons.formatData; - service.formatTimeStamp = $mwtnCommons.formatTimeStamp; - service.deleteDocType = $mwtnDatabase.deleteDocType; - - - var transactionId = 1; - var getHeaders = function () { - return { - 'Accept': 'application/json', - 'Content-Type': 'application/json', - 'X-TransactionId': transactionId++ - } - }; - - // create or modify a pnf in aai - service.createPnf = function (pnf) { - var base = window.location.origin; - var request = { - method: 'PUT', - url: base + '/aai/network/pnfs/pnf/' + pnf['pnf-name'], - // withCredentials: true, - headers: getHeaders(), - data: pnf - }; - var deferred = $q.defer(); - $http(request).then(function successCallback(response) { - deferred.resolve(response); - }, function errorCallback(response) { - deferred.reject(response); - }); - - return deferred.promise; - }; - - service.deletePnf = function (pnf) { - // curl -X DELETE http://localhost:8282/aai/network/pnfs/pnf/Ericsson-A1 --insecure -v -u AAI:AAI -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'X-FromAppId: SDNR' -H 'X-TransactionId: 9999' - var base = window.location.origin; - var request = { - method: 'DELETE', - url: base + '/aai/network/pnfs/pnf/' + pnf['pnf-name'] + '/?resource-version=' + pnf['resource-version'], - // withCredentials: true, - headers: getHeaders() - }; - var deferred = $q.defer(); - $http(request).then(function successCallback(response) { - deferred.resolve(response); - }, function errorCallback(response) { - deferred.reject(response); - }); - - return deferred.promise; - }; - - service.getPnf = function (pnf) { - - console.log('get', JSON.stringify(pnf)); - var base = window.location.origin; - var request = { - method: 'GET', - url: base + '/aai/network/pnfs/pnf/' + pnf['pnf-name'], - // withCredentials: true, - headers: getHeaders() - }; - var deferred = $q.defer(); - $http(request).then(function successCallback(response) { - deferred.resolve(response); - }, function errorCallback(response) { - deferred.reject(response); - }); - - return deferred.promise; - }; - - service.getAaiPnfs = function () { - // curl https://10.31.1.55:8443/network/pnfs -k -v -u abc:def -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'X-FromAppId: SDNR' -H 'X-TransactionId: 9999' - - var base = window.location.origin; - var request = { - method: 'GET', - url: base + '/aai/network/pnfs', // to es config - // withCredentials: true, - headers: getHeaders(), - }; - - var deferred = $q.defer(); - $http(request).then(function successCallback(response) { - deferred.resolve(response); - }, function errorCallback(response) { - deferred.reject(response); - }); - - return deferred.promise; - }; - - return service; - }); - - // Class Device - onapSoApp.register.factory('Device', function () { - var Device = function (data) { - if (!data) { - data = {id:new Date(), type: 'unknown', name:'unknonw', model: 'unkonwn', vendor:'unknonw', version:'unkonwn'}; - } - this.data = data; - this.getData = function () { - return this.data; - }; - this.getId = function () { - return this.getData().id; - }; - this.getType = function () { - return this.getData().type; - }; - this.getName = function () { - return this.getData().name; - }; - this.getModel = function () { - return this.getData().model; - }; - this.getVendor = function () { - return this.getData().vendor; - }; - this.getVersion = function () { - return this.getData().version; - }; - }; - return Device; - }); - -}); diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.tpl.html b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.tpl.html deleted file mode 100644 index 777e2713..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/onapSo-module/src/main/resources/onapSo/onapSo.tpl.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - -
- -
- -
-

Design Phase

-

Create PNF via SO in A&AI

-
- -
-
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- - -
- -
- -
- -
- -
- -
- -
- -
- -
- - -
- -
-
- 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/onapSo/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/pom.xml deleted file mode 100644 index 6dc13ae8..00000000 --- a/sdnr/wireless-transport/code-Carbon-SR1/ux/onapSo/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 - onapSo - 0.5.1-SNAPSHOT - ${prefix} ${project.artifactId} - - - 3.0 - - - - onapSo-module - onapSo-bundle - - -- cgit 1.2.3-korg