Added ADARA tests in vTR Dashboard
Change-Id: I3f2b6e1ab7b2288a23b51d17a08b83e918aef847
diff --git a/xos/gui/src/app/components/vtr/vtr-dashboard.html b/xos/gui/src/app/components/vtr/vtr-dashboard.html
index 4303068..4bb5abd 100644
--- a/xos/gui/src/app/components/vtr/vtr-dashboard.html
+++ b/xos/gui/src/app/components/vtr/vtr-dashboard.html
@@ -42,36 +42,48 @@
<div class="col-xs-12">
<label>Test:</label>
</div>
- <div class="col-xs-4">
+ <div class="col-xs-2 col-xs-offset-1">
<a
ng-click="vm.truckroll.test = 'ping'"
ng-class="{'btn-default': vm.truckroll.test !== 'ping', 'btn-primary': vm.truckroll.test === 'ping'}"
class="btn btn-block">Ping</a>
</div>
- <div class="col-xs-4">
+ <div class="col-xs-2">
<a
ng-click="vm.truckroll.test = 'traceroute'"
ng-class="{'btn-default': vm.truckroll.test !== 'traceroute', 'btn-primary': vm.truckroll.test === 'traceroute'}"
class="btn btn-block">Traceroute</a>
</div>
- <div class="col-xs-4">
+ <div class="col-xs-2">
<a
ng-click="vm.truckroll.test = 'tcpdump'"
ng-class="{'btn-default': vm.truckroll.test !== 'tcpdump', 'btn-primary': vm.truckroll.test === 'tcpdump'}"
class="btn btn-block">Tcp Dump</a>
</div>
+ <div class="col-xs-2">
+ <a
+ ng-click="vm.truckroll.test = 'memory'"
+ ng-class="{'btn-default': vm.truckroll.test !== 'memory', 'btn-primary': vm.truckroll.test === 'memory'}"
+ class="btn btn-block">Memory</a>
+ </div>
+ <div class="col-xs-2">
+ <a
+ ng-click="vm.truckroll.test = 'bandwidth'"
+ ng-class="{'btn-default': vm.truckroll.test !== 'bandwidth', 'btn-primary': vm.truckroll.test === 'bandwidth'}"
+ class="btn btn-block">Bandwidth</a>
+ </div>
</div>
<div class="row">
<div class="col-xs-12">
<label>Argument:</label>
</div>
<div class="col-xs-12">
- <input type="text" class="form-control" ng-model="vm.truckroll.argument" required />
+ <input type="text" class="form-control" ng-model="vm.truckroll.argument"/>
</div>
</div>
<div class="row">
<div class="col-xs-12" ng-show="!vm.loader">
- <button class="btn btn-success btn-block">Run test</button>
+ <button class="btn btn-success">Run test</button>
</div>
</div>
</form>
diff --git a/xos/gui/src/app/components/vtr/vtr-dashboard.ts b/xos/gui/src/app/components/vtr/vtr-dashboard.ts
index 3f60100..6f570e5 100644
--- a/xos/gui/src/app/components/vtr/vtr-dashboard.ts
+++ b/xos/gui/src/app/components/vtr/vtr-dashboard.ts
@@ -24,9 +24,10 @@
this.Truckroll = this.XosVtrTruckroll.getResource();
// load subscribers
- this.XosModelStore.query('CordSubscriberRoot')
+ this.XosModelStore.query('CordSubscriberRoot', '/volt/cordsubscriberroots')
.subscribe(
res => {
+ console.log(res);
this.subscribers = res;
}
);
@@ -89,7 +90,7 @@
// if is synced
if (
testResult.backend_status.indexOf('2') >= 0 ||
- (testResult.result_code && testResult.result_code.indexOf('2') >= 0) ||
+ testResult.backend_status.indexOf('1') >= 0 ||
testResult.is_synced
) {
this.truckroll = angular.copy(testResult);
diff --git a/xos/gui/src/index.html b/xos/gui/src/index.html
index 33dcbd3..c072919 100644
--- a/xos/gui/src/index.html
+++ b/xos/gui/src/index.html
@@ -3,15 +3,15 @@
<head>
<meta charset="UTF-8">
<title>Document</title>
- <link href="http://192.168.46.100/spa/loader.css" rel="stylesheet">
- <link href="http://192.168.46.100/spa/app.css" rel="stylesheet">
+ <link href="/spa/loader.css" rel="stylesheet">
+ <link href="/spa/app.css" rel="stylesheet">
</head>
<body>
<div ui-view></div>
- <script src="http://192.168.46.100/spa/vendor.js"></script>
- <script src="http://192.168.46.100/spa/app.js"></script>
- <script src="http://192.168.46.100/spa/loader.js"></script>
- <script src="http://192.168.46.100/spa/app.config.js"></script>
- <script src="http://192.168.46.100/spa/style.config.js"></script>
+ <script src="/spa/vendor.js"></script>
+ <script src="/spa/app.js"></script>
+ <script src="/spa/loader.js"></script>
+ <script src="/spa/app.config.js"></script>
+ <script src="/spa/style.config.js"></script>
</body>
</html>