Skip to content

Commit

Permalink
Merge "Realted-Bug:#1456562 1)Formatted the details tab 2)Increased t…
Browse files Browse the repository at this point in the history 
…he traceflow/reverse trace flow timeout to 5 mins 3)Changed the title of interfaces tab underlay physical routers 4)Added hyperlink to interface value in details tab which will highlight the interface tab Change-Id: I2ff9ac75b3f10f29c6b419d1051f288a7ffd3316" into R2.20
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed May 20, 2015
2 parents 712fa29 + 86573fd commit a3fae6a
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 114 deletions.
1 change: 1 addition & 0 deletions webroot/monitor/infra/underlay/api/parseURL.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<item>
<url>/api/tenant/networking/trace-flow</url>
<method>post</method>
<timeout>300</timeout>
<feature>underlay</feature>
<callback>underlayApi.getTraceFlow</callback>
</item>
Expand Down
7 changes: 6 additions & 1 deletion webroot/monitor/infra/underlay/ui/js/monitor_infra_underlay.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2505,6 +2505,7 @@ underlayView.prototype.renderTracePath = function(options) {
$.ajax({
url:'/api/tenant/networking/trace-flow',
type:'POST',
timeout:5000,
data:{
data: postData
}
Expand Down Expand Up @@ -2602,6 +2603,7 @@ underlayView.prototype.renderTracePath = function(options) {
$.ajax({
url:'/api/tenant/networking/trace-flow',
type:'POST',
timeout:5000,
data:{
data: postData
}
Expand Down Expand Up @@ -2788,6 +2790,9 @@ underlayView.prototype.populateDetailsTab = function(data) {
};
details = Handlebars.compile($("#device-summary-template").html())(content);
$("#detailsTab").html(details);
$("#pRouterIntfCnt").on('click',function(){
$("#underlay_tabstrip").tabs({active:3});
});
var underlayTabObj = $("#underlay_tabstrip").data('contrailTabs');
underlayTabObj.addTab('pRouterInterfacesTab','Interfaces');
$("#underlay_tabstrip").on('tabsactivate',function(e,ui){
Expand Down Expand Up @@ -2850,7 +2855,7 @@ underlayView.prototype.populateDetailsTab = function(data) {
$(selector).contrailGrid({
header : {
title : {
text : 'Interfaces'
text : 'Interfaces ('+ifNull(data['host_name'],'-')+')'
}
},
columnHeader : {
Expand Down
140 changes: 27 additions & 113 deletions webroot/monitor/infra/underlay/ui/views/monitor_infra_underlay.view
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,130 +13,44 @@ body > svg {
}
</style>
<script type="text/x-handlebars-template" id="device-summary-template">
<div class="span8">
<div class="widget-box transparent">
<div class="widget-body">
<div class="widget-main" id="system-info-stat">
<ul class="item-list">
{{#IfCompare type 'physical-router' operator='=='}}
<li>
<label class="inline">
<span class="key"> Host name </span>
<span class="value"> {{hostName}} </span>
<div class="row-fluid detail-section-content group-detail-container">
<div class="span6 detail-section-column-content">
<div class="detail-block-list-content row-fluid">
<h6>Physical Router Details</h6>
<ul class="item-list">
{{#IfCompare type 'physical-router' operator='=='}}
<li>
<label class="inline row-fluid">
<span class="key span5"> Host name </span>
<span class="value span7"> {{hostName}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Management IP </span>
<span class="value">{{managementIP}}</span>
<label class="inline row-fluid">
<span class="key span5"> Management IP </span>
<span class="value span7">{{managementIP}}</span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Interfaces </span>
<span class="value"> {{intfCnt}} </span>
<label class="inline row-fluid">
<span class="key span5"> Interfaces </span>
<span id="pRouterIntfCnt" class="value span7">
<a class="blue">{{intfCnt}}</a>
</span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Description </span>
<span class="value"> {{description}} </span>
<label class="inline row-fluid">
<span class="key span5"> Description </span>
<span class="value span7"> {{description}} </span>
</label>
</li>
{{/IfCompare}}
{{#IfCompare type 'virtual-router' operator='=='}}
<li>
<label class="inline">
<span class="key"> Host name </span>
<span class="value"> {{hostName}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Version </span>
<span class="value"> {{version}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Memory </span>
<span class="value"> {{memory}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Instances </span>
<span class="value"> {{instanceCount}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Interfaces </span>
<span class="value"> {{interfaceCnt}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Virtual Networks </span>
<span class="value"> {{virtualNetworkCnt}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key hyperlink" onclick=javascript:layoutHandler.setURLHashObj({{#jsonStringify link}}{{/jsonStringify}})>more</span>
</label>
</li>
{{/IfCompare}}
{{#IfCompare type 'virtual-machine' operator='=='}}
<li>
<label class="inline">
<span class="key"> Name </span>
<span class="value"> {{name}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> UUID </span>
<span class="value"> {{uuid}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> IP Address </span>
<span class="value"> {{ipAddr}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Interfaces </span>
<span class="value"> {{interfaceCount}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Virtual Networks </span>
<span class="value"> {{formattedVN}} </span>
</label>
</li>
<li>
<label class="inline">
<span class="key"> Traffic (In/Out) (Last 1 hr) </span>
<span id = "VMstats" class="value">
<i class="grid-header-icon-loading icon-spinner icon-spin"></i>
</span>
</label>
</li>
<li>
<label class="inline">
<span class="key hyperlink" onclick=underlayRenderer.getView().launchVMPage({{#encodedVN link}}{{/encodedVN}})>more</span>
</label>
</li>
{{/IfCompare}}
</ul>
</div>
</div>
</div>
</div>
{{/IfCompare}}
</ul>
<br>
</div>
</div>
</div>
</script>
<script type="text/x-handlebars-template" id="visualization-template">
<div id="underlay_topology">
Expand Down

0 comments on commit a3fae6a

Please sign in to comment.