diff options
-rw-r--r-- | api/resources/v2/containers.py | 4 | ||||
-rw-r--r-- | gui/app/images/checkno.png | bin | 5849 -> 0 bytes | |||
-rw-r--r-- | gui/app/images/checkyes.png | bin | 6423 -> 0 bytes | |||
-rw-r--r-- | gui/app/views/modal/environmentDialog.html | 4 | ||||
-rw-r--r-- | gui/app/views/modal/taskCreate.html | 12 | ||||
-rw-r--r-- | gui/app/views/taskmodify.html | 12 | ||||
-rw-r--r-- | gui/app/views/testcasechoose.html | 4 |
7 files changed, 18 insertions, 18 deletions
diff --git a/api/resources/v2/containers.py b/api/resources/v2/containers.py index ee1903901..f71e607e7 100644 --- a/api/resources/v2/containers.py +++ b/api/resources/v2/containers.py @@ -259,13 +259,13 @@ class V2Containers(ApiResource): def _create_dashboard(self, ip): url = 'http://admin:admin@{}:{}/api/dashboards/db'.format(ip, 3000) - path = os.path.join(consts.REPOS_DIR, 'dashboard', '*dashboard.json') + path = os.path.join(consts.REPOS_DIR, 'dashboard', 'opnfv_yardstick_tc*.json') for i in sorted(glob.iglob(path)): with open(i) as f: data = jsonutils.load(f) try: - HttpClient().post(url, data) + HttpClient().post(url, {'dashboard': data}) except Exception: LOG.exception('Create dashboard %s failed', i) raise diff --git a/gui/app/images/checkno.png b/gui/app/images/checkno.png Binary files differdeleted file mode 100644 index 7c6841930..000000000 --- a/gui/app/images/checkno.png +++ /dev/null diff --git a/gui/app/images/checkyes.png b/gui/app/images/checkyes.png Binary files differdeleted file mode 100644 index ef6028310..000000000 --- a/gui/app/images/checkyes.png +++ /dev/null diff --git a/gui/app/views/modal/environmentDialog.html b/gui/app/views/modal/environmentDialog.html index 4c539fc33..4c4906972 100644 --- a/gui/app/views/modal/environmentDialog.html +++ b/gui/app/views/modal/environmentDialog.html @@ -139,8 +139,8 @@ <th>status</th> </tr> <tr ng-repeat="(name, value) in yardstickImage"> - <td ng-if="selectImageList.indexOf(name) > -1"><img src="images/checkyes.png" style="height:12px;cursor:pointer" ng-click="unselectImage(name)" /></td> - <td ng-if="selectImageList.indexOf(name) == -1"><img src="images/checkno.png" style="height:12px;cursor:pointer" ng-click="selectImage(name)" /></td> + <td ng-if="selectImageList.indexOf(name) > -1"><span class="glyphicon glyphicon-check" aria-hidden="true" ng-click="unselectImage(name)"></span></td> + <td ng-if="selectImageList.indexOf(name) == -1"><span class="glyphicon glyphicon-unchecked" aria-hidden="true" ng-click="selectImage(name)"></span></td> <td>{{name}}</td> <td>{{value.description}}</td> <td>{{value.status}}</td> diff --git a/gui/app/views/modal/taskCreate.html b/gui/app/views/modal/taskCreate.html index e7812cf2b..2d7f1dc3b 100644 --- a/gui/app/views/modal/taskCreate.html +++ b/gui/app/views/modal/taskCreate.html @@ -18,8 +18,8 @@ <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;" ng-class="{deepColor: $index%2==0}"> <div> {{env.name}}</div> <!--<button class="btn btn-default btn-sm" ng-click="gotoDetail('false',env.uuid)">detail</button>--> - <img src="images/checkyes.png" style="height:18px;cursor:pointer" ng-click="constructTestSuit(env.uuid,env.name)" ng-show="selectEnv==env.uuid" /> - <img src="images/checkno.png" style="height:18px;cursor:pointer" ng-click="constructTestSuit(env.uuid,env.name)" ng-show="selectEnv!=env.uuid" /> + <span class="glyphicon glyphicon-check" aria-hidden="true" ng-click="constructTestSuit(env.uuid,env.name)" ng-show="selectEnv==env.uuid"></span> + <span class="glyphicon glyphicon-unchecked" aria-hidden="true" ng-click="constructTestSuit(env.uuid,env.name)" ng-show="selectEnv!=env.uuid"></span> </div> <!--<hr style="margin-top:5px;margin-bottom:5px;" />--> @@ -52,8 +52,8 @@ <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;" ng-class="{deepColor: $index%2==0}"> <div> {{test.Name}}</div> <div style="font-size:10px;">{{test.Description}}</div> - <img src="images/checkyes.png" style="height:18px;cursor:pointer" ng-click="constructTestCase(test.Name)" ng-show="selectCase==test.Name" /> - <img src="images/checkno.png" style="height:18px;cursor:pointer" ng-click="constructTestCase(test.Name)" ng-show="selectCase!=test.Name" /> + <span class="glyphicon glyphicon-check" aria-hidden="true" ng-click="constructTestCase(test.Name)" ng-show="selectCase==test.Name"></span> + <span class="glyphicon glyphicon-unchecked" aria-hidden="true" ng-click="constructTestCase(test.Name)" ng-show="selectCase!=test.Name"></span> </div> <!--<hr style="margin-top:5px;margin-bottom:5px;" />--> @@ -68,8 +68,8 @@ <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;" ng-class="{deepColor: $index%2==0}"> <div> {{suite}}</div> - <img src="images/checkyes.png" style="height:18px;cursor:pointer" ng-click="constructTestCase(suite)" ng-show="selectCase==suite" /> - <img src="images/checkno.png" style="height:18px;cursor:pointer" ng-click="constructTestCase(suite)" ng-show="selectCase!=suite" /> + <span class="glyphicon glyphicon-check" aria-hidden="true" ng-click="constructTestCase(suite)" ng-show="selectCase==suite"></span> + <span class="glyphicon glyphicon-unchecked" aria-hidden="true" ng-click="constructTestCase(suite)" ng-show="selectCase!=suite"></span> </div> <!--<hr style="margin-top:5px;margin-bottom:5px;" />--> diff --git a/gui/app/views/taskmodify.html b/gui/app/views/taskmodify.html index a4593f745..d12df4ba2 100644 --- a/gui/app/views/taskmodify.html +++ b/gui/app/views/taskmodify.html @@ -22,8 +22,8 @@ <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;" ng-class="{deepColor: $index%2==0}"> <div> {{env.name}}</div> <!--<button class="btn btn-default btn-sm" ng-click="gotoDetail('false',env.uuid)">detail</button>--> - <img src="images/checkyes.png" style="height:18px;cursor:pointer" ng-click="constructTestSuit(env.uuid,env.name)" ng-show="selectEnv==env.uuid" /> - <img src="images/checkno.png" style="height:18px;cursor:pointer" ng-click="constructTestSuit(env.uuid,env.name)" ng-show="selectEnv!=env.uuid" /> + <span class="glyphicon glyphicon-check" aria-hidden="true" ng-click="constructTestSuit(env.uuid,env.name)" ng-show="selectEnv==env.uuid"></span> + <span class="glyphicon glyphicon-unchecked" aria-hidden="true" ng-click="constructTestSuit(env.uuid,env.name)" ng-show="selectEnv!=env.uuid"></span> </div> <!--<hr style="margin-top:5px;margin-bottom:5px;" />--> @@ -72,8 +72,8 @@ <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;" ng-class="{deepColor: $index%2==0}"> <div> {{test.Name}}</div> <div style="font-size:10px;">{{test.Description}}</div> - <img src="images/checkyes.png" style="height:18px;cursor:pointer" ng-click="constructTestCase(test.Name)" ng-show="selectCase==test.Name" /> - <img src="images/checkno.png" style="height:18px;cursor:pointer" ng-click="constructTestCase(test.Name)" ng-show="selectCase!=test.Name" /> + <span class="glyphicon glyphicon-check" aria-hidden="true" ng-click="constructTestCase(test.Name)" ng-show="selectCase==test.Name"></span> + <span class="glyphicon glyphicon-unchecked" aria-hidden="true" ng-click="constructTestCase(test.Name)" ng-show="selectCase!=test.Name"></span> </div> <!--<hr style="margin-top:5px;margin-bottom:5px;" />--> @@ -88,8 +88,8 @@ <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;" ng-class="{deepColor: $index%2==0}"> <div> {{suite}}</div> - <img src="images/checkyes.png" style="height:18px;cursor:pointer" ng-click="constructTestCase(suite)" ng-show="selectCase==suite" /> - <img src="images/checkno.png" style="height:18px;cursor:pointer" ng-click="constructTestCase(suite)" ng-show="selectCase!=suite" /> + <span class="glyphicon glyphicon-check" aria-hidden="true" ng-click="constructTestCase(suite)" ng-show="selectCase==suite"></span> + <span class="glyphicon glyphicon-unchecked" aria-hidden="true" ng-click="constructTestCase(suite)" ng-show="selectCase!=suite"></span> </div> <!--<hr style="margin-top:5px;margin-bottom:5px;" />--> diff --git a/gui/app/views/testcasechoose.html b/gui/app/views/testcasechoose.html index 12bdb834f..12fb28c90 100644 --- a/gui/app/views/testcasechoose.html +++ b/gui/app/views/testcasechoose.html @@ -17,8 +17,8 @@ </div>--> <div dir-paginate="test in testcaselist.testcases | itemsPerPage: 10"> <div style="display:flex;flex-direction:row;"> - <img src="images/checkyes.png" style="height:12px;cursor:pointer" ng-click="constructTestSuit(test.Name)" ng-show="testsuiteList.indexOf(test.Name)>-1" /> - <img src="images/checkno.png" style="height:12px;cursor:pointer" ng-click="constructTestSuit(test.Name)" ng-show="testsuiteList.indexOf(test.Name)==-1" /> + <span class="glyphicon glyphicon-check" aria-hidden="true" ng-click="constructTestSuit(test.Name)" ng-show="testsuiteList.indexOf(test.Name)>-1"></span> + <span class="glyphicon glyphicon-unchecked" aria-hidden="true" ng-click="constructTestSuit(test.Name)" ng-show="testsuiteList.indexOf(test.Name)==-1"></span> <div style="margin-left:50px;"> {{test.Name}}</div> <div style="font-size:10px;margin-left:100px">{{test.Description}}</div> |