Remove Hz info from UI

Author: OlegChuev-MD

ui/legacy/scripts/metrics.js

@@ -464,9 +464,9 @@
                         cpunumber: {
                             label: 'label.metrics.num.cpu.cores',
                         },
-                        cputotal: {
-                            label: 'label.metrics.cpu.total'
-                        },
+                        // cputotal: {
+                        //     label: 'label.metrics.cpu.total'
+                        // },
                         cpuused: {
                             label: 'label.metrics.cpu.used.avg',
                         }

ui/src/components/view/InfoCard.vue

@@ -129,8 +129,7 @@
           <div class="resource-detail-item__label">{{ $t('label.cpu') }}</div>
           <div class="resource-detail-item__details">
             <a-icon type="appstore" />
-            <span v-if="resource.cputotal">{{ resource.cputotal }}</span>
-            <span v-else>{{ resource.cpunumber }} CPU x {{ parseFloat(resource.cpuspeed / 1000.0).toFixed(2) }} Ghz</span>
+            <span>{{ resource.cpunumber }} CPU</span>
           </div>
           <div>
             <span v-if="resource.cpuused">

ui/src/config/section/offering.js

@@ -29,9 +29,9 @@ export default {
       icon: 'cloud',
       permission: ['listServiceOfferings', 'listDomains'],
       params: { isrecursive: 'true' },
-      columns: ['name', 'displaytext', 'cpunumber', 'cpuspeed', 'memory', 'domain', 'zone', 'order'],
+      columns: ['name', 'displaytext', 'cpunumber', 'memory', 'domain', 'zone', 'order'],
       details: () => {
-        var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'cpuspeed', 'memory', 'hosttags', 'tags', 'domain', 'zone', 'created']
+        var fields = ['name', 'id', 'displaytext', 'offerha', 'provisioningtype', 'storagetype', 'iscustomized', 'iscustomizediops', 'limitcpuuse', 'cpunumber', 'memory', 'hosttags', 'tags', 'domain', 'zone', 'created']
         if (store.getters.apis.createServiceOffering &&
           store.getters.apis.createServiceOffering.params.filter(x => x.name === 'storagepolicy').length > 0) {
           fields.splice(6, 0, 'vspherestoragepolicy')

ui/src/views/compute/wizard/ComputeOfferingSelection.vue

@@ -136,7 +136,6 @@ export default {
         var maxCpuSpeed = item.cpuspeed
         var maxMemory = item.memory
         var cpuNumberValue = (item.cpunumber !== null && item.cpunumber !== undefined && item.cpunumber > 0) ? item.cpunumber + '' : ''
-        var cpuSpeedValue = (item.cpuspeed !== null && item.cpuspeed !== undefined && item.cpuspeed > 0) ? parseFloat(item.cpuspeed / 1000.0).toFixed(2) + '' : ''
         var ramValue = (item.memory !== null && item.memory !== undefined && item.memory > 0) ? item.memory + '' : ''
         if (item.iscustomized === true) {
           if ('serviceofferingdetails' in item &&
@@ -171,7 +170,7 @@ export default {
         return {
           key: item.id,
           name: item.name,
-          cpu: cpuNumberValue.length > 0 ? `${cpuNumberValue} CPU x ${cpuSpeedValue} Ghz` : '',
+          cpu: cpuNumberValue.length > 0 ? `${cpuNumberValue} CPU` : '',
           ram: ramValue.length > 0 ? `${ramValue} MB` : '',
           disabled: disabled
         }