Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/src/components/view/DetailsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<div v-else-if="$route.meta.name === 'backup' && item === 'volumes'">
<div v-for="(volume, idx) in JSON.parse(dataResource[item])" :key="idx">
<router-link v-if="!dataResource['vmbackupofferingremoved']" :to="{ path: '/volume/' + volume.uuid }">{{ volume.type }} - {{ volume.path }}</router-link>
<span v-else>{{ volume.type }} - {{ volume.path }}</span> ({{ parseFloat(volume.size / (1024.0 * 1024.0 * 1024.0)).toFixed(1) }} GB)
<span v-else>{{ volume.type }} - {{ volume.path }}</span> ({{ parseFloat(volume.size / (1024.0 * 1024.0 * 1024.0)).toFixed(1) }} GiB)
</div>
</div>
<div v-else-if="$route.meta.name === 'computeoffering' && item === 'rootdisksize'">
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/view/InfoCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
<div class="resource-detail-item__label" v-else>{{ $t('label.disksize') }}</div>
<div class="resource-detail-item__details">
<hdd-outlined />
<span style="width: 100%;" v-if="$route.meta.name === 'vm' && resource.volumes">{{ (resource.volumes.reduce((total, item) => total += item.size, 0) / (1024 * 1024 * 1024.0)).toFixed(2) }} GB Storage</span>
<span style="width: 100%;" v-if="$route.meta.name === 'vm' && resource.volumes">{{ (resource.volumes.reduce((total, item) => total += item.size, 0) / (1024 * 1024 * 1024.0)).toFixed(2) }} GiB Storage</span>
<span style="width: 100%;" v-else-if="$route.meta.name === 'backup'">
{{ $bytesToHumanReadableSize(resource.size) }}
<a-tooltip placement="right">
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/view/VolumesTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<status :text="text ? text : ''" />{{ text }}
</template>
<template v-if="column.key === 'size'">
{{ parseFloat(record.size / (1024.0 * 1024.0 * 1024.0)).toFixed(2) }} GB
{{ parseFloat(record.size / (1024.0 * 1024.0 * 1024.0)).toFixed(2) }} GiB
</template>
<template v-if="column.key === 'storage'">
<router-link v-if="record.storageid" :to="{ path: '/storagepool/' + encodeURIComponent(record.storageid) }">{{ text }}</router-link>
Expand Down
67 changes: 67 additions & 0 deletions ui/tests/unit/components/view/DetailsTab.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

import { flushPromises } from '@vue/test-utils'

import common from '../../../common'
import DetailsTab from '@/components/view/DetailsTab.vue'

const i18n = common.createMockI18n('en')

describe('Components > View > DetailsTab.vue', () => {
beforeEach(() => {
jest.spyOn(console, 'warn').mockImplementation(() => {})
})

afterEach(() => {
jest.restoreAllMocks()
})

it('displays backup volume sizes in GiB when the API provides bytes', async () => {
const router = common.createMockRouter([{
path: '/backup/:id',
name: 'backup',
meta: { name: 'backup', details: ['volumes'] },
component: { template: '<div />' }
}])
await router.push('/backup/backup-1')
await router.isReady()

const wrapper = common.createFactory(DetailsTab, {
router,
i18n,
props: {
resource: {
volumes: JSON.stringify([{
uuid: 'volume-1',
type: 'ROOT',
path: 'root.qcow2',
size: 2 * 1024 * 1024 * 1024
}]),
vmbackupofferingremoved: true
}
}
})

await flushPromises()

expect(wrapper.text()).toContain('2.0 GiB')
expect(wrapper.text()).not.toContain('2.0 GB')

wrapper.unmount()
})
})
64 changes: 64 additions & 0 deletions ui/tests/unit/components/view/InfoCard.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

import { flushPromises } from '@vue/test-utils'

import common from '../../../common'
import InfoCard from '@/components/view/InfoCard.vue'

const i18n = common.createMockI18n('en')

describe('Components > View > InfoCard.vue', () => {
beforeEach(() => {
jest.spyOn(console, 'warn').mockImplementation(() => {})
})

afterEach(() => {
jest.restoreAllMocks()
})

it('displays VM volume totals in GiB when the API provides bytes', async () => {
const router = common.createMockRouter([{
path: '/vm/:id',
name: 'vm',
meta: { name: 'vm' },
component: { template: '<div />' }
}])
await router.push('/vm/vm-1')
await router.isReady()

const wrapper = common.createFactory(InfoCard, {
router,
i18n,
store: common.createMockStore({ user: { apis: {} } }),
props: {
resource: {
name: 'test-vm',
vmtype: 'UserVm',
volumes: [{ size: 2 * 1024 * 1024 * 1024 }]
}
}
})

await flushPromises()

expect(wrapper.text()).toContain('2.00 GiB Storage')
expect(wrapper.text()).not.toContain('2.00 GB Storage')

wrapper.unmount()
})
})
58 changes: 58 additions & 0 deletions ui/tests/unit/components/view/VolumesTab.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

import { flushPromises } from '@vue/test-utils'

import common from '../../../common'
import VolumesTab from '@/components/view/VolumesTab.vue'

const router = common.createMockRouter()
const i18n = common.createMockI18n('en')

describe('Components > View > VolumesTab.vue', () => {
beforeEach(() => {
jest.spyOn(console, 'warn').mockImplementation(() => {})
})

afterEach(() => {
jest.restoreAllMocks()
})

it('displays byte-based volume sizes in GiB', async () => {
const wrapper = common.createFactory(VolumesTab, {
router,
i18n,
props: {
resource: { id: 'vm-1' },
items: [{
id: 'volume-1',
name: 'Data volume',
state: 'Ready',
type: 'DATADISK',
size: 2 * 1024 * 1024 * 1024
}]
}
})

await flushPromises()

expect(wrapper.text()).toContain('2.00 GiB')
expect(wrapper.text()).not.toContain('2.00 GB')

wrapper.unmount()
})
})