shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-19 21:57:24 +03:00
Code Releases Wiki Activity

Feature #4217: Add zone column to cli and sunstone

Browse Source
This commit is contained in:
Carlos Martín 2016-04-01 12:55:13 +02:00
parent 4100de65a7
commit 0901ddeb51
11 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cli/etc/onemarket.yaml
View File

@ -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

8
src/cli/etc/onemarketapp.yaml
View File

@ -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

6
src/cli/one_helper/onemarket_helper.rb
View File

@ -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

12
src/cli/one_helper/onemarketapp_helper.rb
View File

@ -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

6
src/sunstone/etc/sunstone-views/admin.yaml
View File

@ -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

6
src/sunstone/etc/sunstone-views/admin_vcenter.yaml
View File

@ -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

6
src/sunstone/etc/sunstone-views/groupadmin.yaml
View File

@ -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

6
src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
View File

@ -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

6
src/sunstone/etc/sunstone-views/user.yaml
View File

@ -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

5
src/sunstone/public/app/tabs/marketplaceapps-tab/datatable.js
View File

@ -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])||'')
];
}

5
src/sunstone/public/app/tabs/marketplaces-tab/datatable.js
View File

@ -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])||'')
];
}