commit 2846b11825d47be0d38d0bfdff091adcd2c63856
author MaoLu <Lu.Mao@molex.com> Mon May 15 17:18:55 2017 -0700
committer Andrea Campanella <andrea@onlab.us> Wed May 17 21:00:10 2017 +0000
tree 9a3109b9010864a418eef497ce5527e31056e2bf
parent 7af71da9b8d38342449e22dd0fe4591540a85315

Improvements of roadm application:
  1.Fix the bug of Treating path index as port number for APS;
  2.Creating APS switching operations dynamically, instead of hard code;
  3.Change APS interface for general using;
  4.Compatible test base on the devices of OPENFLOW and NETCONF protocol.

Change-Id: Ib750d40ed28fc184a96b58e97715beab3d80ff17

apps/roadm/src/main/resources/app/view/roadmPort/roadmPort.js

diff --git a/apps/roadm/src/main/resources/app/view/roadmPort/roadmPort.js b/apps/roadm/src/main/resources/app/view/roadmPort/roadmPort.js
index 128b72c..05f05dd 100644
--- a/apps/roadm/src/main/resources/app/view/roadmPort/roadmPort.js
+++ b/apps/roadm/src/main/resources/app/view/roadmPort/roadmPort.js
@@ -40,6 +40,10 @@
         $scope.showTargetPower = data.showTargetPower;
         $scope.showServiceState = data.showServiceState;
         $scope.showFlowIcon = data.showFlowIcon;
+        $scope.opsModeTypes = data.opsOperations;
+        if ($scope.opsModeType == null) {
+            $scope.opsModeType = $scope.opsModeTypes[0];
+        }
         $scope.$apply();
     }
 
@@ -47,7 +51,8 @@
         wss.sendEvent(SET_OPS_MODE_REQ,
             {
                 devId: $scope.devId,
-                index: $scope.opsModeType.index
+                index: $scope.opsModeType.index,
+                operation: $scope.opsModeType.operation
             });
     }
 
@@ -86,12 +91,7 @@
             $scope.deviceTip = 'Show device table';
             $scope.flowTip = 'Show flow view for this device';
             $scope.portTip = 'Show port view for this device';
-            $scope.opsModeTypes = [
-                {index: 0, type: "Auto"},
-                {index: 1, type: "Primary"},
-                {index: 2, type: "Secondary"}
-            ];
-            $scope.opsModeType = $scope.opsModeTypes[0];//auto mode
+            $scope.opsModeType = null;
 
             var handlers = {};
             handlers[SET_TARGET_POWER_RESP] = portPowerCb;