diff --git a/src/cli/etc/onemarket.yaml b/src/cli/etc/onemarket.yaml index 2d593e1d71..9a651248e0 100644 --- a/src/cli/etc/onemarket.yaml +++ b/src/cli/etc/onemarket.yaml @@ -1,11 +1,11 @@ --- :ID: - :desc: ONE identifier for the Marketplace + :desc: ONE identifier for the Marketplace :size: 4 :NAME: :desc: Name of the Marketplace - :size: 30 + :size: 20 :left: true :SIZE: @@ -28,8 +28,8 @@ :default: - :ID +- :NAME - :SIZE - :AVAIL - :APPS - :MAD -- :NAME diff --git a/src/cli/etc/onemarketapp.yaml b/src/cli/etc/onemarketapp.yaml index e1958cfa18..4467dcb471 100644 --- a/src/cli/etc/onemarketapp.yaml +++ b/src/cli/etc/onemarketapp.yaml @@ -1,19 +1,19 @@ --- :ID: - :desc: ONE identifier for the marketplace app + :desc: ONE identifier for the MarketPlaceApp :size: 4 :NAME: - :desc: Name of the marketplace app - :size: 15 + :desc: Name of the MarketPlaceApp + :size: 25 :left: true :VERSION: - :desc: Version of the marketplace app - :size: 7 + :desc: Version of the MarketPlaceApp + :size: 10 :SIZE: - :desc: Marketplace app size (M) + :desc: MarketPlaceApp size (M) :size: 5 :STAT: @@ -21,22 +21,16 @@ :size: 4 :TYPE: - :desc: Marketplace app type + :desc: MarketPlaceApp type :size: 4 :DATE: - :desc: Publishing date for the marketplace app + :desc: Publishing date for the MarketPlaceApp :size: 8 :MARKET: - :desc: ID of the marketplace - :size: 6 - -:PUBLISHER: - :desc: Publisher of the marketplace app - :size: 25 - :left: true - + :desc: Name of the MarketPlace + :size: 20 :default: - :ID @@ -47,4 +41,3 @@ - :TYPE - :DATE - :MARKET -- :PUBLISHER diff --git a/src/cli/one_helper/onemarketapp_helper.rb b/src/cli/one_helper/onemarketapp_helper.rb index c32ef5078b..27ad9f6973 100644 --- a/src/cli/one_helper/onemarketapp_helper.rb +++ b/src/cli/one_helper/onemarketapp_helper.rb @@ -43,10 +43,6 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper d["NAME"] end - column :PUBLISHER, "Publisher of the App", :left, :size=>25 do |d| - d["PUBLISHER"] - end - column :VERSION, "Version of the app", :size=>7 do |d| d["VERSION"] end @@ -68,11 +64,11 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper MarketPlaceApp::SHORT_MARKETPLACEAPP_TYPES[type] end - column :MARKET, "ID of the marketplace", :size=>6 do |d| - d["MARKETPLACE_ID"] + column :MARKET, "Name of the MarketPlace", :size=>6 do |d| + d["MARKETPLACE"] end - default :ID,:NAME,:VERSION,:SIZE,:STAT,:TYPE,:DATE,:MARKET,:PUBLISHER + default :ID,:NAME,:VERSION,:SIZE,:STAT,:TYPE,:DATE,:MARKET end table