From 55bb29b1d7b977b387a74f754b4baea94274141c Mon Sep 17 00:00:00 2001 From: grakiss Date: Mon, 30 Oct 2017 07:26:37 +0000 Subject: [cvp-web] Show some SUT hardware info in 'My Results' [cvp-web] Show SUT endpoint in web page JIRA: DOVETAIL-541 JIRA: DOVETAIL-547 Show some SUT hardware info that dovetail concern in 'My Results' web page. Show the info of all endpoints get from Dovetail tool in the web page. Change-Id: Ibc465396e17b7c22678e3948fa2f659cbff6f323 Signed-off-by: grakiss --- cvp/3rd_party/static/testapi-ui/app.js | 7 +++- .../testapi-ui/components/results/results.html | 6 ++- .../components/results/resultsController.js | 5 +++ .../static/testapi-ui/components/sut/sut.html | 40 ++++++++++++++++++ .../testapi-ui/components/sut/sutController.js | 48 ++++++++++++++++++++++ cvp/3rd_party/static/testapi-ui/index.html | 3 +- 6 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 cvp/3rd_party/static/testapi-ui/components/sut/sut.html create mode 100644 cvp/3rd_party/static/testapi-ui/components/sut/sutController.js (limited to 'cvp/3rd_party') diff --git a/cvp/3rd_party/static/testapi-ui/app.js b/cvp/3rd_party/static/testapi-ui/app.js index 5a3cc069..eea8e38e 100644 --- a/cvp/3rd_party/static/testapi-ui/app.js +++ b/cvp/3rd_party/static/testapi-ui/app.js @@ -115,7 +115,12 @@ templateUrl: '/testapi-ui/components/products/cloud.html', controller: 'ProductController as ctrl' }). - state('application', { + state('sut', { + url: '/suts/:testID', + templateUrl: '/testapi-ui/components/sut/sut.html', + controller: 'SutController as ctrl' + }). + state('application', { url: '/application', templateUrl: '/testapi-ui/components/application/application.html', controller: 'ApplicationController as ctrl' diff --git a/cvp/3rd_party/static/testapi-ui/components/results/results.html b/cvp/3rd_party/static/testapi-ui/components/results/results.html index e1d05b2d..cd38ad75 100644 --- a/cvp/3rd_party/static/testapi-ui/components/results/results.html +++ b/cvp/3rd_party/static/testapi-ui/components/results/results.html @@ -25,6 +25,7 @@ Label Status Log + SUT Operation Share List @@ -32,13 +33,14 @@ - {{ result.upload_date }} + {{ result.upload_date | limitTo:19}} {{ result.id }} {{ result.filename || "None"}}
{{ result.label || "None" }}
{{ result.status }} logs - + info +
Operation diff --git a/cvp/3rd_party/static/testapi-ui/components/results/resultsController.js b/cvp/3rd_party/static/testapi-ui/components/results/resultsController.js index 2ece86fb..86f7c5d6 100644 --- a/cvp/3rd_party/static/testapi-ui/components/results/resultsController.js +++ b/cvp/3rd_party/static/testapi-ui/components/results/resultsController.js @@ -59,6 +59,7 @@ ctrl.associateProductVersion = associateProductVersion; ctrl.getProductVersions = getProductVersions; ctrl.prepVersionEdit = prepVersionEdit; + ctrl.gotoSUT = gotoSUT; ctrl.gotoResultDetail = gotoResultDetail; ctrl.toggleCheck = toggleCheck; ctrl.toReview = toReview; @@ -496,5 +497,9 @@ $state.go('resultsDetail', {'testID': testId, 'innerID': innerID}); } + function gotoSUT(testId) { + $state.go('sut', {'testID': testId}); + } + } })(); diff --git a/cvp/3rd_party/static/testapi-ui/components/sut/sut.html b/cvp/3rd_party/static/testapi-ui/components/sut/sut.html new file mode 100644 index 00000000..d9692b87 --- /dev/null +++ b/cvp/3rd_party/static/testapi-ui/components/sut/sut.html @@ -0,0 +1,40 @@ + + + + +

Endpoints

+
+ + + + + + + + + + + + + + + + + +
Service NameService TypeURLEnabled
{{ endpoint['Service Name'] }}{{ endpoint['Service Type'] }}{{ endpoint['URL'] }}{{ endpoint['Enabled'] }}
+
+ +

Hosts

+
+
+ + + + + + + +
{{ record[0] }}{{ record[1] }}
+
+
diff --git a/cvp/3rd_party/static/testapi-ui/components/sut/sutController.js b/cvp/3rd_party/static/testapi-ui/components/sut/sutController.js new file mode 100644 index 00000000..3d662ffa --- /dev/null +++ b/cvp/3rd_party/static/testapi-ui/components/sut/sutController.js @@ -0,0 +1,48 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +(function () { + 'use strict'; + + angular + .module('testapiApp') + .controller('SutController', SutController); + + SutController.$inject = [ + '$http', '$stateParams', 'testapiApiUrl' + ]; + + /** + */ + function SutController($http, $stateParams, testapiApiUrl) { + + var ctrl = this; + + function init(){ + ctrl.sutData = {"hardware_info": {}, "endpoint_info": {}}; + ctrl.testID = $stateParams.testID; + ctrl.getSutData(); + } + + ctrl.getSutData = function(){ + $http.get(testapiApiUrl + "/suts/hardware/" + ctrl.testID).then(function(resp){ + ctrl.sutData = resp.data; + }, function(error){ + alert('Error when get SUT data'); + }); + } + + init(); + } +})(); diff --git a/cvp/3rd_party/static/testapi-ui/index.html b/cvp/3rd_party/static/testapi-ui/index.html index b6bdb5a1..8ca6e631 100644 --- a/cvp/3rd_party/static/testapi-ui/index.html +++ b/cvp/3rd_party/static/testapi-ui/index.html @@ -51,7 +51,8 @@ - + + -- cgit 1.2.3-korg