Remove deprecated "sid" parameter in UI events.
Change-Id: Ib39fe563109068e7a97df809e9dd1f9f7506fbc6
diff --git a/web/gui/src/main/webapp/app/README.txt b/web/gui/src/main/webapp/app/README.txt
index d5f94d8..cffc8a1 100644
--- a/web/gui/src/main/webapp/app/README.txt
+++ b/web/gui/src/main/webapp/app/README.txt
@@ -1,6 +1,6 @@
-# Main Application
+# Main ONOS UI Web Application
-index.html is the main launch point for the application.
+../index.html is the main launch point for the application.
fw/ contains framework related code
diff --git a/web/gui/src/main/webapp/app/directives.js b/web/gui/src/main/webapp/app/directives.js
index ce94bd6..0e85d76 100644
--- a/web/gui/src/main/webapp/app/directives.js
+++ b/web/gui/src/main/webapp/app/directives.js
@@ -15,7 +15,7 @@
*/
/*
- ONOS GUI -- General Purpose Angular directives defined here.
+ ONOS GUI -- General Purpose Angular directives.
*/
(function () {
diff --git a/web/gui/src/main/webapp/app/fw/remote/websocket.js b/web/gui/src/main/webapp/app/fw/remote/websocket.js
index bd1f44d..55c7b40 100644
--- a/web/gui/src/main/webapp/app/fw/remote/websocket.js
+++ b/web/gui/src/main/webapp/app/fw/remote/websocket.js
@@ -27,7 +27,6 @@
var webSockOpts, // web socket options
ws = null, // web socket reference
wsUp = false, // web socket is good to go
- sid = 0, // event sequence identifier
handlers = {}, // event handler bindings
pendingEvents = [], // events TX'd while socket not up
host, // web socket host
@@ -108,7 +107,7 @@
function handleClose() {
var gsucc;
- $log.info('Web socket closed');
+ $log.warn('Web socket closed');
ls && ls.stop();
wsUp = false;
@@ -167,9 +166,6 @@
// === API Functions
// Required for unit tests to set to known state
- function resetSid() {
- sid = 0;
- }
function resetState() {
webSockOpts = undefined;
ws = null;
@@ -178,7 +174,6 @@
url = undefined;
pendingEvents = [];
handlers = {};
- sid = 0;
clusterNodes = [];
clusterIndex = -1;
connectRetries = 0;
@@ -291,7 +286,6 @@
function sendEvent(evType, payload) {
var ev = {
event: evType,
- sid: ++sid,
payload: payload || {}
};
@@ -329,7 +323,6 @@
bindHandlers(builtinHandlers);
return {
- resetSid: resetSid,
resetState: resetState,
createWebSocket: createWebSocket,
bindHandlers: bindHandlers,
diff --git a/web/gui/src/main/webapp/tests/app/fw/remote/websocket-spec.js b/web/gui/src/main/webapp/tests/app/fw/remote/websocket-spec.js
index 6b0d4a7..fc7aa09 100644
--- a/web/gui/src/main/webapp/tests/app/fw/remote/websocket-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/remote/websocket-spec.js
@@ -79,7 +79,7 @@
it('should define api functions', function () {
expect(fs.areFunctions(wss, [
- 'resetSid', 'resetState',
+ 'resetState',
'createWebSocket', 'bindHandlers', 'unbindHandlers',
'addOpenListener', 'removeOpenListener', 'sendEvent',
'isConnected', 'loggedInUser',
@@ -118,7 +118,6 @@
it('should send pending events, handleOpen', function () {
var fakeEvent = {
event: 'mockEv',
- sid: 1,
payload: { mock: 'thing' }
};
wss.sendEvent(fakeEvent.event, fakeEvent.payload);