Copyright header fix

- added copyright header to css and js files
- small fixes in css files

Change-Id: I62a32067d71ede7a7440662b1816f939659101e7
Signed-off-by: Daniel Malachovsky <daniel.malachovsky@pantheon.sk>

diff --git a/.gitignore b/.gitignore
index f7e7cca..c54c646 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ target
 .DS_Store
 META-INF
 maven-metadata-local.xml
+vbd/gui/module/node

diff --git a/vbd/gui/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/vbd/gui/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index b8c866d..265cd75 100644 (file)
--- a/vbd/gui/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/vbd/gui/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -11,9 +11,9 @@
         <property name="angularJs" value="app.vpp"/>
                <property name="cssDependencies">
             <list>
-                 <value>src/app/vpp/vpp.css</value>
                  <value>src/app/vpp/assets/css/next.css</value>
                  <value>src/app/vpp/bower_components/angular-material/angular-material.min.css</value>
+                 <value>src/app/vpp/assets/css/vpp.css</value>
             </list>
         </property>
     </bean>

diff --git a/vbd/gui/module/src/main/resources/vpp/assets/css/vpp.css b/vbd/gui/module/src/main/resources/vpp/assets/css/vpp.css
index 0ca4643..45eb9f1 100644 (file)
--- a/vbd/gui/module/src/main/resources/vpp/assets/css/vpp.css
+++ b/vbd/gui/module/src/main/resources/vpp/assets/css/vpp.css
@@ -1,7 +1,15 @@
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. 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
+ */
+
 html,body {
     width: 100%;
-    height: 100%;
     overflow: hidden;
+    background-color: #414040;
 }
 
 #next-app {

diff --git a/vbd/gui/module/src/main/resources/vpp/bower.json b/vbd/gui/module/src/main/resources/vpp/bower.json
index 14f7035..a6edf58 100644 (file)
--- a/vbd/gui/module/src/main/resources/vpp/bower.json
+++ b/vbd/gui/module/src/main/resources/vpp/bower.json
@@ -5,7 +5,8 @@
   "authors": [
     "Varun Seereeram",
     "Chris Metz",
-    "Dave Wallace"
+    "Dave Wallace",
+    "Daniel Malachovsky"
   ],
   "license": "ISC",
   "keywords": [

diff --git a/vbd/gui/module/src/main/resources/vpp/main.js b/vbd/gui/module/src/main/resources/vpp/main.js
index 5ca86fd..6fdc5c2 100644 (file)
--- a/vbd/gui/module/src/main/resources/vpp/main.js
+++ b/vbd/gui/module/src/main/resources/vpp/main.js
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. 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
+ */
 require.config({
   paths : {
     'angular-material' : 'app/vpp/bower_components/angular-material/angular-material.min',

diff --git a/vbd/gui/module/src/main/resources/vpp/package.json b/vbd/gui/module/src/main/resources/vpp/package.json
index b049c92..3909fb8 100644 (file)
--- a/vbd/gui/module/src/main/resources/vpp/package.json
+++ b/vbd/gui/module/src/main/resources/vpp/package.json
@@ -1,23 +1,18 @@
 {
-  "name": "open-vpp",
+  "name": "odl-vpp",
   "version": "1.0.0",
-  "description": "open-vpp",
-  "main": "app.js",
-  "dependencies": {
-    "express": "^4.13.3",
-    "express-http-proxy": "^0.6.0",
-    "url": "^0.11.0"
-  },
+  "description": "Opendaylight VPP UI",
+  "main": "main.js",
   "devDependencies": {
     "bower": "~1.3.12"
   },
   "repository": {
     "type": "git",
-    "url": "ssh://git@stash-eng.cisco.com:7999/~dwallace/honeycomb-demo.git"
+    "url": "git clone https://gerrit.fd.io/r/honeycomb"
   },
-  "author": "Varun Seereeram, Chris Metz, John Burns, Dave Wallace",
+  "author": "Varun Seereeram, Chris Metz, John Burns, Dave Wallace, Daniel Malachovsky",
   "license": "ISC",
   "keywords": [
-    "open-vpp"
+    "odl-vpp"
   ]
 }

diff --git a/vbd/gui/module/src/main/resources/vpp/vpp.controller.js b/vbd/gui/module/src/main/resources/vpp/vpp.controller.js
index 17d5a10..ebfd49a 100644 (file)
--- a/vbd/gui/module/src/main/resources/vpp/vpp.controller.js
+++ b/vbd/gui/module/src/main/resources/vpp/vpp.controller.js
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. 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
+ */
+
 var modules = ['app/vpp/vpp.module',
                'app/vpp/vpp.services',
                ];
@@ -17,10 +25,11 @@ define(modules, function(vpp) {
            };
        }]);
 
-    vpp.register.controller('InventoryTableController', ['$scope', '$rootScope','$filter', 'toastService', 'VppService', '$mdDialog', 'dataService', 'InterfaceService', function($scope, $rootScope, filter, toastService, VppService, $mdDialog, dataService, InterfaceService) {
+    vpp.register.controller('InventoryTableController', ['$scope', '$rootScope','$filter', 'toastService', 'VppService', '$mdDialog', 'dataService', 'VppInterfaceService',
+        function($scope, $rootScope, filter, toastService, VppService, $mdDialog, dataService, VppInterfaceService) {
         
         $scope.getInterfaces = function(index) {
-            InterfaceService.getInterfaceList(
+            VppInterfaceService.getInterfaceList(
                 $scope.vppList[index].name,
                 //success callback
                 function(data) {

diff --git a/vbd/gui/module/src/main/resources/vpp/vpp.module.js b/vbd/gui/module/src/main/resources/vpp/vpp.module.js
index 5286e39..04367de 100644 (file)
--- a/vbd/gui/module/src/main/resources/vpp/vpp.module.js
+++ b/vbd/gui/module/src/main/resources/vpp/vpp.module.js
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. 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', 'ui-bootstrap', 'Restangular', 'angular-animate', 'angular-aria', 'angular-material', 'angular-smart-table', 'angular-translate', 'angular-translate-loader-partial'], function() {
 
   var vpp = angular.module('app.vpp', ['ui.router.state','app.core', 'ui.bootstrap', 'restangular', 'ngAnimate', 'ngAria', 'ngMaterial', 'smart-table', 'pascalprecht.translate']);

diff --git a/vbd/gui/module/src/main/resources/vpp/vpp.services.js b/vbd/gui/module/src/main/resources/vpp/vpp.services.js
index c212f4f..7f082ae 100644 (file)
--- a/vbd/gui/module/src/main/resources/vpp/vpp.services.js
+++ b/vbd/gui/module/src/main/resources/vpp/vpp.services.js
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. 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/vpp/vpp.module', 'next'], function(vpp) {
 
     vpp.register.factory('VPPRestangular', function(Restangular, ENV) {
@@ -474,49 +481,6 @@ define(['app/vpp/vpp.module', 'next'], function(vpp) {
             });
         };
 
-        s.editVpp = function(name,ip,port,un,pw,finishedSuccessfullyCallback) {
-                var putData =  '\
-            <module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">\
-            <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">prefix:sal-netconf-connector</type>\
-            <name>'+name+'</name>\
-            <address xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">'+ip+'</address>\
-            <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">'+port+'</port>\
-                <username xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">'+un+'</username>\
-                <password xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">'+pw+'</password>\
-                <tcp-only xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">false</tcp-only>\
-                <event-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">\
-                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">prefix:netty-event-executor</type>\
-            <name>global-event-executor</name>\
-            </event-executor>\
-            <binding-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">\
-                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-broker-osgi-registry</type>\
-            <name>binding-osgi-broker</name>\
-            </binding-registry>\
-            <dom-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">\
-                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-broker-osgi-registry</type>\
-            <name>dom-broker</name>\
-            </dom-registry>\
-            <client-dispatcher xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">\
-                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf">prefix:netconf-client-dispatcher</type>\
-            <name>global-netconf-dispatcher</name>\
-            </client-dispatcher>\
-            <processing-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">\
-                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:threadpool">prefix:threadpool</type>\
-            <name>global-netconf-processing-executor</name>\
-            </processing-executor>\
-            </module>';
-            //var configVpp = '/api/restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules/module/odl-sal-netconf-connector-cfg:sal-netconf-connector/';
-
-
-            var restObj = VPPRestangularXml.one('restconf').one('config').one('network-topology:network-topology').one('topology').one('topology-netconf').one('node').one('controller-config').one('yang-ext:mount').one('config:modules').one('module').one('odl-sal-netconf-connector-cfg:sal-netconf-connector').one(name);
-
-            restObj.customPUT(putData).then(function() {
-                finishedSuccessfullyCallback(true);
-            }, function(res) {
-                finishedSuccessfullyCallback(false);
-            });
-        };
-
         s.mountVpp = function(name,ip,port,un,pw,finishedSuccessfullyCallback) {
 
             var postData =  '\
@@ -562,7 +526,7 @@ define(['app/vpp/vpp.module', 'next'], function(vpp) {
         return s;
        });
 
-    vpp.register.factory('InterfaceService', function(VPPRestangular) {
+    vpp.register.factory('VppInterfaceService', function(VPPRestangular) {
         var s = {};
 
         s.getInterfaceList = function(vppName,successCallback, errorCallback) {