Skip to content

Commit

Permalink
Merge "Closes-Bug: #1548582 Added abiltiy to fetch active Stat time f…
Browse files Browse the repository at this point in the history 
…or a given time range"
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed Mar 23, 2016
2 parents 5c077d2 + ba893ba commit 191a9e8
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 154 deletions.
24 changes: 8 additions & 16 deletions webroot/reports/qe/ui/js/views/FlowRecordFormView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@ define([
hashParams = layoutHandler.getURLHashParams(),
queryPageTmpl = contrail.getTemplate4Id(ctwc.TMPL_QUERY_PAGE),
queryType = contrail.checkIfExist(hashParams.queryType) ? hashParams.queryType : null,
queryFormAttributes = contrail.checkIfExist(hashParams.queryFormAttributes) ? hashParams.queryFormAttributes : {},
flowRecordQueryModel = new FlowRecordFormModel(queryFormAttributes),
widgetConfig = contrail.checkIfExist(viewConfig.widgetConfig) ? viewConfig.widgetConfig : null,
queryFormId = cowc.QE_HASH_ELEMENT_PREFIX + cowc.FR_QUERY_PREFIX + cowc.QE_FORM_SUFFIX,
flowRecordId = cowl.QE_FLOW_RECORD_ID;

self.model = flowRecordQueryModel;
self.$el.append(queryPageTmpl({queryPrefix: cowc.FR_QUERY_PREFIX }));
flowRecordId = cowl.QE_FLOW_RECORD_ID,
queryFormAttributes = contrail.checkIfExist(hashParams.queryFormAttributes) ? hashParams.queryFormAttributes : {};

if (queryType === cowc.QUERY_TYPE_MODIFY) {
self.model.from_time(parseInt(queryFormAttributes.from_time));
self.model.to_time(parseInt(queryFormAttributes.to_time));
queryFormAttributes.from_time = parseInt(queryFormAttributes.from_time_utc);
queryFormAttributes.to_time = parseInt(queryFormAttributes.to_time_utc);
}

self.model = new FlowRecordFormModel(queryFormAttributes);
self.$el.append(queryPageTmpl({queryPrefix: cowc.FR_QUERY_PREFIX }));

self.renderView4Config($(self.$el).find(queryFormId), this.model, self.getViewConfig(), cowc.KEY_RUN_QUERY_VALIDATION, null, modelMap, function () {
self.model.showErrorAttr(flowRecordId, false);
Knockback.applyBindings(self.model, document.getElementById(flowRecordId));
Expand Down Expand Up @@ -70,14 +69,7 @@ define([
queryFormModel.is_request_in_progress(true);
qewu.fetchServerCurrentTime(function(serverCurrentTime) {
var timeRange = parseInt(queryFormModel.time_range()),
queryRequestPostData;

if (timeRange !== -1) {
queryFormModel.to_time(serverCurrentTime);
queryFormModel.from_time(serverCurrentTime - (timeRange * 1000));
}

queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);
queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);

self.renderView4Config($(queryResultId), self.model,
getQueryResultTabViewConfig(self, queryRequestPostData, queryResultTabId), null, null, modelMap,
Expand Down
24 changes: 8 additions & 16 deletions webroot/reports/qe/ui/js/views/FlowSeriesFormView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@ define([
hashParams = layoutHandler.getURLHashParams(),
queryPageTmpl = contrail.getTemplate4Id(ctwc.TMPL_QUERY_PAGE),
queryType = contrail.checkIfExist(hashParams.queryType) ? hashParams.queryType : null,
queryFormAttributes = contrail.checkIfExist(hashParams.queryFormAttributes) ? hashParams.queryFormAttributes : {},
flowSeriesQueryModel = new FlowSeriesFormModel(queryFormAttributes),
widgetConfig = contrail.checkIfExist(viewConfig.widgetConfig) ? viewConfig.widgetConfig : null,
queryFormId = cowc.QE_HASH_ELEMENT_PREFIX + cowc.FS_QUERY_PREFIX + cowc.QE_FORM_SUFFIX,
flowSeriesId = cowl.QE_FLOW_SERIES_ID;

self.model = flowSeriesQueryModel;
self.$el.append(queryPageTmpl({queryPrefix: cowc.FS_QUERY_PREFIX}));
flowSeriesId = cowl.QE_FLOW_SERIES_ID,
queryFormAttributes = contrail.checkIfExist(hashParams.queryFormAttributes) ? hashParams.queryFormAttributes : {};

if (queryType === cowc.QUERY_TYPE_MODIFY) {
self.model.from_time(parseInt(queryFormAttributes.from_time));
self.model.to_time(parseInt(queryFormAttributes.to_time));
queryFormAttributes.from_time = parseInt(queryFormAttributes.from_time_utc);
queryFormAttributes.to_time = parseInt(queryFormAttributes.to_time_utc);
}

self.model = new FlowSeriesFormModel(queryFormAttributes);
self.$el.append(queryPageTmpl({queryPrefix: cowc.FS_QUERY_PREFIX}));

self.renderView4Config($(queryFormId), self.model, self.getViewConfig(), cowc.KEY_RUN_QUERY_VALIDATION, null, modelMap, function () {
self.model.showErrorAttr(flowSeriesId, false);
Knockback.applyBindings(self.model, document.getElementById(flowSeriesId));
Expand Down Expand Up @@ -70,14 +69,7 @@ define([
queryFormModel.is_request_in_progress(true);
qewu.fetchServerCurrentTime(function(serverCurrentTime) {
var timeRange = parseInt(queryFormModel.time_range()),
queryRequestPostData;

if (timeRange !== -1) {
queryFormModel.to_time(serverCurrentTime);
queryFormModel.from_time(serverCurrentTime - (timeRange * 1000));
}

queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);
queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);

self.renderView4Config($(queryResultId), self.model,
getQueryResultTabViewConfig(queryRequestPostData, queryResultTabId), null, null, modelMap,
Expand Down
24 changes: 8 additions & 16 deletions webroot/reports/qe/ui/js/views/ObjectLogsFormView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,19 @@ define([
hashParams = layoutHandler.getURLHashParams(),
queryPageTmpl = contrail.getTemplate4Id(ctwc.TMPL_QUERY_PAGE),
queryType = contrail.checkIfExist(hashParams.queryType) ? hashParams.queryType : null,
queryFormAttributes = contrail.checkIfExist(hashParams.queryFormAttributes) ? hashParams.queryFormAttributes : {},
objectLogsQueryFormModel = new ObjectLogsFormModel(queryFormAttributes),
widgetConfig = contrail.checkIfExist(viewConfig.widgetConfig) ? viewConfig.widgetConfig : null,
queryFormId = cowc.QE_HASH_ELEMENT_PREFIX + cowc.OBJECT_LOGS_PREFIX + cowc.QE_FORM_SUFFIX,
objectLogsId = cowl.QE_OBJECT_LOGS_ID;

self.model = objectLogsQueryFormModel;
self.$el.append(queryPageTmpl({queryPrefix: cowc.OBJECT_LOGS_PREFIX }));
objectLogsId = cowl.QE_OBJECT_LOGS_ID,
queryFormAttributes = contrail.checkIfExist(hashParams.queryFormAttributes) ? hashParams.queryFormAttributes : {};

if (queryType === cowc.QUERY_TYPE_MODIFY) {
self.model.from_time(parseInt(queryFormAttributes.from_time));
self.model.to_time(parseInt(queryFormAttributes.to_time));
queryFormAttributes.from_time = parseInt(queryFormAttributes.from_time_utc);
queryFormAttributes.to_time = parseInt(queryFormAttributes.to_time_utc);
}

self.model = new ObjectLogsFormModel(queryFormAttributes),
self.$el.append(queryPageTmpl({queryPrefix: cowc.OBJECT_LOGS_PREFIX }));

self.renderView4Config($(self.$el).find(queryFormId), this.model, self.getViewConfig(), cowc.KEY_RUN_QUERY_VALIDATION, null, modelMap, function () {
self.model.showErrorAttr(objectLogsId, false);
Knockback.applyBindings(self.model, document.getElementById(objectLogsId));
Expand Down Expand Up @@ -71,14 +70,7 @@ define([
queryFormModel.is_request_in_progress(true);
qewu.fetchServerCurrentTime(function(serverCurrentTime) {
var timeRange = parseInt(queryFormModel.time_range()),
queryRequestPostData;

if (timeRange !== -1) {
queryFormModel.to_time(serverCurrentTime);
queryFormModel.from_time(serverCurrentTime - (timeRange * 1000));
}

queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);
queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);

self.renderView4Config($(queryResultId), self.model,
getQueryResultTabViewConfig(queryRequestPostData, queryResultTabId), null, null, modelMap,
Expand Down
118 changes: 27 additions & 91 deletions webroot/reports/qe/ui/js/views/StatQueryFormView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ define([
hashParams = layoutHandler.getURLHashParams(),
queryPageTmpl = contrail.getTemplate4Id(ctwc.TMPL_QUERY_PAGE),
queryType = contrail.checkIfExist(hashParams.queryType) ? hashParams.queryType : null,
queryFormAttributes = contrail.checkIfExist(hashParams.queryFormAttributes) ? hashParams.queryFormAttributes : {},
statQueryFormModel = new StatQueryFormModel(queryFormAttributes),
widgetConfig = contrail.checkIfExist(viewConfig.widgetConfig) ? viewConfig.widgetConfig : null,
queryFormId = cowc.QE_HASH_ELEMENT_PREFIX + cowc.STAT_QUERY_PREFIX + cowc.QE_FORM_SUFFIX,
statQueryId = cowl.QE_STAT_QUERY_ID;

self.model = statQueryFormModel;
self.$el.append(queryPageTmpl({queryPrefix: cowc.STAT_QUERY_PREFIX }));
statQueryId = cowl.QE_STAT_QUERY_ID,
queryFormAttributes = contrail.checkIfExist(hashParams.queryFormAttributes) ? hashParams.queryFormAttributes : {};

if (queryType === cowc.QUERY_TYPE_MODIFY) {
self.model.from_time(parseInt(queryFormAttributes.from_time));
self.model.to_time(parseInt(queryFormAttributes.to_time));
queryFormAttributes.from_time = parseInt(queryFormAttributes.from_time_utc);
queryFormAttributes.to_time = parseInt(queryFormAttributes.to_time_utc);
}

self.model = new StatQueryFormModel(queryFormAttributes);
self.$el.append(queryPageTmpl({queryPrefix: cowc.STAT_QUERY_PREFIX }));


self.renderView4Config($(queryFormId), self.model, self.getViewConfig(), cowc.KEY_RUN_QUERY_VALIDATION, null, modelMap, function () {
self.model.showErrorAttr(statQueryId, false);
Knockback.applyBindings(self.model, document.getElementById(statQueryId));
Expand Down Expand Up @@ -69,62 +69,7 @@ define([

queryFormModel.is_request_in_progress(true);
qewu.fetchServerCurrentTime(function(serverCurrentTime) {
var timeRange = parseInt(queryFormModel.time_range()),
queryRequestPostData;

if (timeRange !== -1) {
queryFormModel.to_time(serverCurrentTime);
queryFormModel.from_time(serverCurrentTime - (timeRange * 1000));
}

queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);

self.renderView4Config($(queryResultId), self.model,
getQueryResultTabViewConfig(queryRequestPostData, queryResultTabId), null, null, modelMap,
function() {
var queryResultTabView = self.childViewMap[queryResultTabId],
queryResultListModel = modelMap[cowc.UMID_QUERY_RESULT_LIST_MODEL];

if (!(queryResultListModel.isRequestInProgress()) && queryResultListModel.getItems().length > 0) {
self.renderQueryResultChartTab(queryResultTabView, queryResultTabId, queryFormModel, queryRequestPostData)
queryFormModel.is_request_in_progress(false);
} else {
queryResultListModel.onAllRequestsComplete.subscribe(function () {
if (queryResultListModel.getItems().length > 0) {
self.renderQueryResultChartTab(queryResultTabView, queryResultTabId, queryFormModel, queryRequestPostData)
}
queryFormModel.is_request_in_progress(false);
});
}
});
});
},

renderQueryResult: function() {
var self = this,
viewConfig = self.attributes.viewConfig,
widgetConfig = contrail.checkIfExist(viewConfig.widgetConfig) ? viewConfig.widgetConfig : null,
modelMap = contrail.handleIfNull(self.modelMap, {}),
queryFormModel = self.model,
queryFormId = cowc.QE_HASH_ELEMENT_PREFIX + cowc.STAT_QUERY_PREFIX + cowc.QE_FORM_SUFFIX,
queryResultId = cowc.QE_HASH_ELEMENT_PREFIX + cowc.STAT_QUERY_PREFIX + cowc.QE_RESULTS_SUFFIX,
queryResultTabId = cowl.QE_STAT_QUERY_TAB_ID;

if (widgetConfig !== null) {
$(queryFormId).parents('.widget-box').data('widget-action').collapse();
}

queryFormModel.is_request_in_progress(true);
qewu.fetchServerCurrentTime(function(serverCurrentTime) {
var timeRange = parseInt(queryFormModel.time_range()),
queryRequestPostData;

if (timeRange !== -1) {
queryFormModel.to_time(serverCurrentTime);
queryFormModel.from_time(serverCurrentTime - (timeRange * 1000));
}

queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);
var queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);

self.renderView4Config($(queryResultId), self.model,
getQueryResultTabViewConfig(queryRequestPostData, queryResultTabId), null, null, modelMap,
Expand Down Expand Up @@ -168,33 +113,6 @@ define([
view: "SectionView",
viewConfig: {
rows: [
{
columns: [
{
elementId: 'table_name', view: "FormComboboxView",
viewConfig: {
path: 'table_name',
dataBindValue: 'table_name',
class: "span6",
elementConfig: {
defaultValueId: 0, allowClear: false, placeholder: cowl.QE_SELECT_STAT_TABLE,
dataTextField: "name", dataValueField: "name",
dataSource: {
type: 'remote', url: cowc.URL_TABLES, parse: function (response) {
var parsedOptionList = [];
for(var i = 0; i < response.length; i++) {
if(response[i].type == 'STAT') {
parsedOptionList.push(response[i]);
}
}
return parsedOptionList;
}
}
}
}
}
]
},
{
columns: [
{
Expand Down Expand Up @@ -223,6 +141,24 @@ define([
}
]
},
{
columns: [
{
elementId: 'table_name', view: "FormComboboxView",
viewConfig: {
label: 'Active Table',
path: 'table_name',
dataBindValue: 'table_name',
dataBindOptionList: 'table_name_data_object',
class: "span6",
elementConfig: {
defaultValueId: 0, allowClear: false, placeholder: cowl.QE_SELECT_STAT_TABLE,
dataTextField: "name", dataValueField: "name",
}
}
}
]
},
{
viewConfig: {
visible: 'isTableNameAvailable()'
Expand Down
22 changes: 7 additions & 15 deletions webroot/reports/qe/ui/js/views/SystemLogsFormView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,17 @@ define([
hashParams = layoutHandler.getURLHashParams(),
queryPageTmpl = contrail.getTemplate4Id(ctwc.TMPL_QUERY_PAGE),
queryType = contrail.checkIfExist(hashParams.queryType) ? hashParams.queryType : null,
queryFormAttributes = contrail.checkIfExist(hashParams.queryFormAttributes) ? hashParams.queryFormAttributes : {},
systemLogsQueryFormModel = new SystemLogsFormModel(queryFormAttributes),
widgetConfig = contrail.checkIfExist(viewConfig.widgetConfig) ? viewConfig.widgetConfig : null,
queryFormId = cowc.QE_HASH_ELEMENT_PREFIX + cowc.SYSTEM_LOGS_PREFIX + cowc.QE_FORM_SUFFIX,
systemLogsId = cowl.QE_SYSTEM_LOGS_ID;

self.model = systemLogsQueryFormModel;
self.$el.append(queryPageTmpl({queryPrefix: cowc.SYSTEM_LOGS_PREFIX }));
systemLogsId = cowl.QE_SYSTEM_LOGS_ID,
queryFormAttributes = contrail.checkIfExist(hashParams.queryFormAttributes) ? hashParams.queryFormAttributes : {};

if (queryType === cowc.QUERY_TYPE_MODIFY) {
self.model.from_time(parseInt(queryFormAttributes.from_time));
self.model.to_time(parseInt(queryFormAttributes.to_time));
queryFormAttributes.from_time = parseInt(queryFormAttributes.from_time_utc);
queryFormAttributes.to_time = parseInt(queryFormAttributes.to_time_utc);
}
self.model = new SystemLogsFormModel(queryFormAttributes);
self.$el.append(queryPageTmpl({queryPrefix: cowc.SYSTEM_LOGS_PREFIX }));

self.renderView4Config($(self.$el).find(queryFormId), this.model, self.getViewConfig(), cowc.KEY_RUN_QUERY_VALIDATION, null, modelMap, function () {
self.model.showErrorAttr(systemLogsId, false);
Expand Down Expand Up @@ -70,14 +68,8 @@ define([
queryFormModel.is_request_in_progress(true);
qewu.fetchServerCurrentTime(function(serverCurrentTime) {
var timeRange = parseInt(queryFormModel.time_range()),
queryRequestPostData;

if (timeRange !== -1) {
queryFormModel.to_time(serverCurrentTime);
queryFormModel.from_time(serverCurrentTime - (timeRange * 1000));
}
queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);

queryRequestPostData = queryFormModel.getQueryRequestPostData(serverCurrentTime);
queryRequestPostData.chunkSize = cowc.QE_RESULT_CHUNK_SIZE_10K;
self.renderView4Config($(queryResultId), self.model,
getQueryResultTabViewConfig(queryRequestPostData, queryResultTabId), null, null, modelMap,
Expand Down

0 comments on commit 191a9e8

Please sign in to comment.