From 0901ddeb514f988ccd07719b1013c6bd1691679f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 1 Apr 2016 12:55:13 +0200 Subject: [PATCH] Feature #4217: Add zone column to cli and sunstone --- src/cli/etc/onemarket.yaml | 5 +++-- src/cli/etc/onemarketapp.yaml | 8 +++++++- src/cli/one_helper/onemarket_helper.rb | 6 +++++- src/cli/one_helper/onemarketapp_helper.rb | 12 ++++++++---- src/sunstone/etc/sunstone-views/admin.yaml | 6 ++++-- src/sunstone/etc/sunstone-views/admin_vcenter.yaml | 6 ++++-- src/sunstone/etc/sunstone-views/groupadmin.yaml | 6 ++++-- .../etc/sunstone-views/groupadmin_vcenter.yaml | 6 ++++-- src/sunstone/etc/sunstone-views/user.yaml | 6 ++++-- .../public/app/tabs/marketplaceapps-tab/datatable.js | 5 ++++- .../public/app/tabs/marketplaces-tab/datatable.js | 5 ++++- 11 files changed, 51 insertions(+), 20 deletions(-) diff --git a/src/cli/etc/onemarket.yaml b/src/cli/etc/onemarket.yaml index 1cdd5fe8bc..b7608ed26d 100644 --- a/src/cli/etc/onemarket.yaml +++ b/src/cli/etc/onemarket.yaml @@ -15,11 +15,11 @@ :NAME: :desc: Name of the Marketplace - :size: 20 + :size: 30 :left: true :SIZE: - :desc: Marketplace total size (M) + :desc: Marketplace total size :size: 10 :AVAIL: @@ -43,3 +43,4 @@ - :AVAIL - :APPS - :MAD +- :ZONE \ No newline at end of file diff --git a/src/cli/etc/onemarketapp.yaml b/src/cli/etc/onemarketapp.yaml index 1f9346cb1f..cd8dc560e8 100644 --- a/src/cli/etc/onemarketapp.yaml +++ b/src/cli/etc/onemarketapp.yaml @@ -13,7 +13,7 @@ :size: 10 :SIZE: - :desc: MarketPlaceApp size (M) + :desc: MarketPlaceApp size :size: 5 :STAT: @@ -31,6 +31,11 @@ :MARKET: :desc: Name of the MarketPlace :size: 20 + :left: true + +:ZONE: + :desc: Zone ID + :size: 4 :default: - :ID @@ -41,3 +46,4 @@ - :TYPE - :REGTIME - :MARKET +- :ZONE \ No newline at end of file diff --git a/src/cli/one_helper/onemarket_helper.rb b/src/cli/one_helper/onemarket_helper.rb index 997af13929..fa39af9979 100644 --- a/src/cli/one_helper/onemarket_helper.rb +++ b/src/cli/one_helper/onemarket_helper.rb @@ -82,7 +82,11 @@ class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper d["MARKET_MAD"] end - default :ID, :USER, :GROUP, :NAME, :SIZE, :AVAIL, :APPS, :TYPE, :MAD, :NAME + column :ZONE, "Zone ID", :size=>4 do |d| + d["ZONE_ID"] + end + + default :ID, :NAME, :SIZE, :AVAIL, :APPS, :MAD, :ZONE end table diff --git a/src/cli/one_helper/onemarketapp_helper.rb b/src/cli/one_helper/onemarketapp_helper.rb index 12cbb0ae6c..f456d32082 100644 --- a/src/cli/one_helper/onemarketapp_helper.rb +++ b/src/cli/one_helper/onemarketapp_helper.rb @@ -65,11 +65,11 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper d["ID"] end - column :NAME, "Name of the marketplace app", :left, :size=>15 do |d| + column :NAME, "Name of the marketplace app", :left, :size=>25 do |d| d["NAME"] end - column :VERSION, "Version of the app", :size=>7 do |d| + column :VERSION, "Version of the app", :size=>10 do |d| d["VERSION"] end @@ -90,11 +90,15 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper MarketPlaceApp::SHORT_MARKETPLACEAPP_TYPES[type] end - column :MARKET, "Name of the MarketPlace", :size=>6 do |d| + column :MARKET, "Name of the MarketPlace", :left, :size=>20 do |d| d["MARKETPLACE"] end - default :ID,:NAME,:VERSION,:SIZE,:STAT,:TYPE,:REGTIME,:MARKET + column :ZONE, "Zone ID", :size=>4 do |d| + d["ZONE_ID"] + end + + default :ID,:NAME,:VERSION,:SIZE,:STAT,:TYPE,:REGTIME,:MARKET,:ZONE end table diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 835d57f3a8..8f736a7b06 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -508,7 +508,8 @@ tabs: - 5 # Capacity - 6 # Apps - 7 # Driver - #- 8 # Labels + - 8 # Zone + #- 9 # Labels actions: MarketPlace.refresh: true MarketPlace.create_dialog: true @@ -534,7 +535,8 @@ tabs: #- 8 # Type - 9 # Registration - 10 # Marketplace - #- 11 # Labels + - 11 # Zone + #- 12 # Labels actions: MarketPlaceApp.refresh: true MarketPlaceApp.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml index 17db081e3b..f15f62cc7e 100644 --- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml @@ -507,7 +507,8 @@ tabs: - 5 # Capacity - 6 # Apps - 7 # Driver - #- 8 # Labels + - 8 # Zone + #- 9 # Labels actions: MarketPlace.refresh: true MarketPlace.create_dialog: true @@ -533,7 +534,8 @@ tabs: #- 8 # Type - 9 # Registration - 10 # Marketplace - #- 11 # Labels + - 11 # Zone + #- 12 # Labels actions: MarketPlaceApp.refresh: true MarketPlaceApp.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/groupadmin.yaml b/src/sunstone/etc/sunstone-views/groupadmin.yaml index a11d926ce3..39e8559777 100644 --- a/src/sunstone/etc/sunstone-views/groupadmin.yaml +++ b/src/sunstone/etc/sunstone-views/groupadmin.yaml @@ -507,7 +507,8 @@ tabs: - 5 # Capacity - 6 # Apps - 7 # Driver - #- 8 # Labels + - 8 # Zone + #- 9 # Labels actions: MarketPlace.refresh: true MarketPlace.create_dialog: true @@ -533,7 +534,8 @@ tabs: #- 8 # Type - 9 # Registration - 10 # Marketplace - #- 11 # Labels + - 11 # Zone + #- 12 # Labels actions: MarketPlaceApp.refresh: true MarketPlaceApp.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml index 770200e78b..de6629ab26 100644 --- a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml @@ -507,7 +507,8 @@ tabs: - 5 # Capacity - 6 # Apps - 7 # Driver - #- 8 # Labels + - 8 # Zone + #- 9 # Labels actions: MarketPlace.refresh: true MarketPlace.create_dialog: true @@ -533,7 +534,8 @@ tabs: #- 8 # Type - 9 # Registration - 10 # Marketplace - #- 11 # Labels + - 11 # Zone + #- 12 # Labels actions: MarketPlaceApp.refresh: true MarketPlaceApp.create_dialog: true diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index 0a9ed38740..1f4e599247 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -511,7 +511,8 @@ tabs: - 5 # Capacity - 6 # Apps - 7 # Driver - #- 8 # Labels + - 8 # Zone + #- 9 # Labels actions: MarketPlace.refresh: true MarketPlace.create_dialog: true @@ -537,7 +538,8 @@ tabs: #- 8 # Type - 9 # Registration - 10 # Marketplace - #- 11 # Labels + - 11 # Zone + #- 12 # Labels actions: MarketPlaceApp.refresh: true MarketPlaceApp.create_dialog: true diff --git a/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js index 6a08ea3052..7b8dd2a41b 100644 --- a/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js +++ b/src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js @@ -24,6 +24,7 @@ define(function(require) { var Locale = require('utils/locale'); var OpenNebulaMarketPlaceApp = require('opennebula/marketplaceapp'); var OpenNebulaMarketPlace = require('opennebula/marketplace'); + var OpenNebulaZone = require('opennebula/zone'); var LabelsUtils = require('utils/labels/utils'); var Humanize = require('utils/humanize'); @@ -34,7 +35,7 @@ define(function(require) { var RESOURCE = "MarketPlaceApp"; var XML_ROOT = "MARKETPLACEAPP"; var TAB_NAME = require('./tabId'); - var LABELS_COLUMN = 11; + var LABELS_COLUMN = 12; var TEMPLATE_ATTR = 'TEMPLATE'; /* @@ -87,6 +88,7 @@ define(function(require) { Locale.tr("Type"), Locale.tr("Registration Time"), Locale.tr("Marketplace"), + Locale.tr("Zone"), Locale.tr("Labels") ] @@ -130,6 +132,7 @@ define(function(require) { OpenNebulaMarketPlaceApp.typeStr(element.TYPE), Humanize.prettyTime(element.REGTIME), element.MARKETPLACE, + OpenNebulaZone.getName(element.ZONE_ID), (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||'') ]; } diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js b/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js index 8e6b788cac..aaa09b90d8 100644 --- a/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js +++ b/src/sunstone/public/app/tabs/marketplaces-tab/datatable.js @@ -23,6 +23,7 @@ define(function(require) { var SunstoneConfig = require('sunstone-config'); var Locale = require('utils/locale'); var OpenNebulaMarketPlace = require('opennebula/marketplace'); + var OpenNebulaZone = require('opennebula/zone'); var DatastoreCapacityBar = require('../datastores-tab/utils/datastore-capacity-bar'); var LabelsUtils = require('utils/labels/utils'); @@ -33,7 +34,7 @@ define(function(require) { var RESOURCE = "MarketPlace"; var XML_ROOT = "MARKETPLACE"; var TAB_NAME = require('./tabId'); - var LABELS_COLUMN = 8; + var LABELS_COLUMN = 9; var TEMPLATE_ATTR = 'TEMPLATE'; /* @@ -83,6 +84,7 @@ define(function(require) { Locale.tr("Capacity"), Locale.tr("Apps"), Locale.tr("Driver"), + Locale.tr("Zone"), Locale.tr("Labels") ] @@ -123,6 +125,7 @@ define(function(require) { DatastoreCapacityBar.html(element), _lengthOf(element.MARKETPLACEAPPS.ID), element.MARKET_MAD, + OpenNebulaZone.getName(element.ZONE_ID), (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||'') ]; }