diff --git a/.zuul.yaml b/.zuul.yaml index 7156d30b..45828d90 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -550,9 +550,12 @@ - ^src/pages/network/.*$ - ^src/stores/neutron/.*$ - ^src/stores/octavia/.*$ + - ^src/resources/neutron/.*$ + - ^src/resources/octavia/.*$ # storage - ^src/pages/storage/.*$ - ^src/stores/cinder/.*$ + - ^src/resources/cinder/.*$ # other - ^src/pages/auth/.*$ - ^src/pages/base/.*$ @@ -564,8 +567,9 @@ - ^src/pages/user-center/.*$ - ^src/stores/heat/.*$ - ^src/stores/keystone/.*$ + - ^src/resources/heat/.*$ + - ^src/resources/keystone/.*$ # no run - - ^src/resources/.*$ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ @@ -582,9 +586,13 @@ - ^src/stores/ironic/.*$ - ^src/stores/nova/.*$ - ^src/stores/skyline/.*$ + - ^src/resources/glance/.*$ + - ^src/resources/ironic/.*$ + - ^src/resources/nova/.*$ # storage - ^src/pages/storage/.*$ - ^src/stores/cinder/.*$ + - ^src/resources/cinder/.*$ # other - ^src/pages/auth/.*$ - ^src/pages/base/.*$ @@ -596,8 +604,9 @@ - ^src/pages/user-center/.*$ - ^src/stores/heat/.*$ - ^src/stores/keystone/.*$ + - ^src/resources/heat/.*$ + - ^src/resources/keystone/.*$ # no run - - ^src/resources/.*$ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ @@ -614,15 +623,20 @@ - ^src/stores/ironic/.*$ - ^src/stores/nova/.*$ - ^src/stores/skyline/.*$ + - ^src/resources/glance/.*$ + - ^src/resources/ironic/.*$ + - ^src/resources/nova/.*$ # network - ^src/pages/network/.*$ - ^src/stores/neutron/.*$ - ^src/stores/octavia/.*$ + - ^src/resources/neutron/.*$ + - ^src/resources/octavia/.*$ # storage - ^src/pages/storage/.*$ - ^src/stores/cinder/.*$ + - ^src/resources/cinder/.*$ # no run - - ^src/resources/.*$ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ @@ -639,10 +653,15 @@ - ^src/stores/ironic/.*$ - ^src/stores/nova/.*$ - ^src/stores/skyline/.*$ + - ^src/resources/glance/.*$ + - ^src/resources/ironic/.*$ + - ^src/resources/nova/.*$ # network - ^src/pages/network/.*$ - ^src/stores/neutron/.*$ - ^src/stores/octavia/.*$ + - ^src/resources/neutron/.*$ + - ^src/resources/octavia/.*$ # other - ^src/pages/auth/.*$ - ^src/pages/base/.*$ @@ -654,8 +673,9 @@ - ^src/pages/user-center/.*$ - ^src/stores/heat/.*$ - ^src/stores/keystone/.*$ + - ^src/resources/heat/.*$ + - ^src/resources/keystone/.*$ # no run - - ^src/resources/.*$ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ diff --git a/src/components/FormItem/NetworkSelect/index.jsx b/src/components/FormItem/NetworkSelect/index.jsx index 8bd36994..d2444b80 100644 --- a/src/components/FormItem/NetworkSelect/index.jsx +++ b/src/components/FormItem/NetworkSelect/index.jsx @@ -18,7 +18,7 @@ import Select from 'components/FormItem/Select'; import PropTypes from 'prop-types'; import { ipValidate } from 'utils/validate'; import { QuestionCircleOutlined } from '@ant-design/icons'; -import { ipTypeOptions } from 'resources/network'; +import { ipTypeOptions } from 'resources/neutron/network'; // import { getIpInitValue } from 'resources/instance'; import styles from './index.less'; diff --git a/src/components/FormItem/NetworkSelectTable/index.jsx b/src/components/FormItem/NetworkSelectTable/index.jsx index bfaede27..b19b167a 100644 --- a/src/components/FormItem/NetworkSelectTable/index.jsx +++ b/src/components/FormItem/NetworkSelectTable/index.jsx @@ -17,7 +17,7 @@ import { inject, observer } from 'mobx-react'; import TabSelectTable from 'components/FormItem/TabSelectTable'; import { NetworkStore } from 'stores/neutron/network'; import { yesNoOptions } from 'utils/constants'; -import { networkColumns, networkSortProps } from 'resources/network'; +import { networkColumns, networkSortProps } from 'resources/neutron/network'; import { isAdminPage } from 'utils/index'; import { getPath } from 'utils/route-map'; diff --git a/src/components/FormItem/VolumeSelectTable/index.jsx b/src/components/FormItem/VolumeSelectTable/index.jsx index f3043b73..722cf773 100644 --- a/src/components/FormItem/VolumeSelectTable/index.jsx +++ b/src/components/FormItem/VolumeSelectTable/index.jsx @@ -20,7 +20,7 @@ import { volumeColumns, volumeFilters, volumeSortProps, -} from 'resources/volume'; +} from 'resources/cinder/volume'; @inject('rootStore') @observer diff --git a/src/components/Layout/GlobalHeader/OpenRc.jsx b/src/components/Layout/GlobalHeader/OpenRc.jsx index 8678a0bd..3ebb3ec2 100644 --- a/src/components/Layout/GlobalHeader/OpenRc.jsx +++ b/src/components/Layout/GlobalHeader/OpenRc.jsx @@ -14,9 +14,12 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; -import { allCanReadPolicy } from 'resources/policy'; +import { allCanReadPolicy } from 'resources/keystone/policy'; import globalAuthCatalogStore from 'stores/keystone/catalog'; -import { getCredentialOpenRc, getPwdOpenRc } from 'resources/openstack-rc'; +import { + getCredentialOpenRc, + getPwdOpenRc, +} from 'resources/keystone/openstack-rc'; import FileSaver from 'file-saver'; @inject('rootStore') diff --git a/src/components/Layout/GlobalHeader/ProjectTable.jsx b/src/components/Layout/GlobalHeader/ProjectTable.jsx index 72f50ce8..5238c264 100644 --- a/src/components/Layout/GlobalHeader/ProjectTable.jsx +++ b/src/components/Layout/GlobalHeader/ProjectTable.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; -import { allCanReadPolicy } from 'resources/policy'; +import { allCanReadPolicy } from 'resources/keystone/policy'; import globalUserStore from 'stores/keystone/user'; @inject('rootStore') diff --git a/src/components/Layout/GlobalHeader/Token.jsx b/src/components/Layout/GlobalHeader/Token.jsx index 140cac05..007329f0 100644 --- a/src/components/Layout/GlobalHeader/Token.jsx +++ b/src/components/Layout/GlobalHeader/Token.jsx @@ -16,7 +16,7 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import { Typography } from 'antd'; import { ModalAction } from 'containers/Action'; -import { allCanReadPolicy } from 'resources/policy'; +import { allCanReadPolicy } from 'resources/keystone/policy'; import { getLocalTime } from 'utils/time'; import styles from './index.less'; diff --git a/src/components/Notify/index.jsx b/src/components/Notify/index.jsx index 25a87d29..3f90e218 100644 --- a/src/components/Notify/index.jsx +++ b/src/components/Notify/index.jsx @@ -25,7 +25,7 @@ import CodeEditor from 'components/CodeEditor'; import ModalButton from 'components/ModalButton'; import globalRootStore from 'stores/root'; import { unescapeHtml } from 'utils/index'; -import { statusMap } from 'resources/code'; +import { statusMap } from 'src/utils/code'; import { isEmpty, isString } from 'lodash'; import styles from './index.less'; diff --git a/src/components/Popover/PopoverNetworks.jsx b/src/components/Popover/PopoverNetworks.jsx index adee8434..28248d81 100644 --- a/src/components/Popover/PopoverNetworks.jsx +++ b/src/components/Popover/PopoverNetworks.jsx @@ -14,7 +14,7 @@ import React from 'react'; import { NetworkStore } from 'stores/neutron/network'; -import { networkStatus } from 'resources/network'; +import { networkStatus } from 'resources/neutron/network'; import IPopover from './Popover'; export default function PopoverNetworks(props) { diff --git a/src/components/TableButton/RuleButton.jsx b/src/components/TableButton/RuleButton.jsx index f0685fe1..19d15634 100644 --- a/src/components/TableButton/RuleButton.jsx +++ b/src/components/TableButton/RuleButton.jsx @@ -14,7 +14,7 @@ import React, { Component } from 'react'; import TableButton from 'components/TableButton'; -import { getSelfColumns } from 'resources/security-group-rule'; +import { getSelfColumns } from 'resources/neutron/security-group-rule'; import { getPath } from 'utils/route-map'; export default class RuleButton extends Component { diff --git a/src/components/Tables/Base/Action/index.jsx b/src/components/Tables/Base/Action/index.jsx index 7d9c3d22..4f207330 100644 --- a/src/components/Tables/Base/Action/index.jsx +++ b/src/components/Tables/Base/Action/index.jsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import checkItemPolicy, { systemRoleIsReader } from 'resources/policy'; +import checkItemPolicy, { systemRoleIsReader } from 'resources/keystone/policy'; export async function checkAllowed({ item, diff --git a/src/containers/List/index.jsx b/src/containers/List/index.jsx index f3512bd5..7303dce1 100644 --- a/src/containers/List/index.jsx +++ b/src/containers/List/index.jsx @@ -31,7 +31,7 @@ import BaseTable from 'components/Tables/Base'; import { isAdminPage } from 'utils/index'; import Notify from 'components/Notify'; import { checkTimeIn } from 'utils/time'; -import checkItemPolicy from 'resources/policy'; +import checkItemPolicy from 'resources/keystone/policy'; import NotFound from 'components/Cards/NotFound'; import { getTags } from 'components/MagicInput'; import { getPath, getLinkRender } from 'utils/route-map'; diff --git a/src/containers/TabDetail/index.jsx b/src/containers/TabDetail/index.jsx index f04ffe5e..a58cbdbe 100644 --- a/src/containers/TabDetail/index.jsx +++ b/src/containers/TabDetail/index.jsx @@ -23,7 +23,7 @@ import NotFound from 'components/Cards/NotFound'; import Infos from 'components/Infos'; import Notify from 'components/Notify'; import { toJS } from 'mobx'; -import checkItemPolicy from 'resources/policy'; +import checkItemPolicy from 'resources/keystone/policy'; import ItemActionButtons from 'components/Tables/Base/ItemActionButtons'; import { emptyActionConfig } from 'utils/constants'; import { getPath, getLinkRender } from 'utils/route-map'; diff --git a/src/core/index.jsx b/src/core/index.jsx index 734b3931..255eeef5 100644 --- a/src/core/index.jsx +++ b/src/core/index.jsx @@ -22,7 +22,7 @@ import zhCN from 'antd/es/locale/zh_CN'; import enUS from 'antd/es/locale/en_US'; import globalRootStore from 'stores/root'; import PageLoading from 'components/PageLoading'; -import metricDict from 'resources/metricDict'; +import metricDict from 'resources/prometheus/metricDict'; import i18n from './i18n'; import App from './App'; diff --git a/src/layouts/Base/index.jsx b/src/layouts/Base/index.jsx index 10bef734..9ac7bd2b 100644 --- a/src/layouts/Base/index.jsx +++ b/src/layouts/Base/index.jsx @@ -18,7 +18,7 @@ import { toJS, reaction } from 'mobx'; import i18n from 'core/i18n'; import { isAdminPage, isUserCenterPage } from 'utils/index'; import { BellOutlined } from '@ant-design/icons'; -import checkItemPolicy from 'resources/policy'; +import checkItemPolicy from 'resources/keystone/policy'; import { Layout } from 'antd'; import GlobalHeader from 'components/Layout/GlobalHeader'; import { setRouteMap, getPath } from 'utils/route-map'; diff --git a/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Edit.jsx b/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Edit.jsx index 0df2f0ba..7ed79c3a 100644 --- a/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Edit.jsx +++ b/src/pages/compute/containers/BareMetalNode/Detail/Port/actions/Edit.jsx @@ -21,7 +21,7 @@ import KeyValueInput from 'components/FormItem/KeyValueInput'; import { isEmpty, has, isEqual, get } from 'lodash'; import { macAddressValidate } from 'utils/validate'; import { updateObjToAddSelectArray } from 'utils/index'; -import { getDifFromAddSelectValue } from 'resources/ironic'; +import { getDifFromAddSelectValue } from 'resources/ironic/ironic'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Edit.jsx b/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Edit.jsx index f70ae441..f7a22251 100644 --- a/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Edit.jsx +++ b/src/pages/compute/containers/BareMetalNode/Detail/PortGroup/actions/Edit.jsx @@ -20,7 +20,7 @@ import KeyValueInput from 'components/FormItem/KeyValueInput'; import { isEmpty, has, isEqual, get } from 'lodash'; import { macAddressValidate } from 'utils/validate'; import { updateObjToAddSelectArray } from 'utils/index'; -import { getDifFromAddSelectValue } from 'resources/ironic'; +import { getDifFromAddSelectValue } from 'resources/ironic/ironic'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/BareMetalNode/Detail/index.jsx b/src/pages/compute/containers/BareMetalNode/Detail/index.jsx index b01d0854..18fd8ea6 100644 --- a/src/pages/compute/containers/BareMetalNode/Detail/index.jsx +++ b/src/pages/compute/containers/BareMetalNode/Detail/index.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import { IronicStore } from 'stores/ironic/ironic'; import Base from 'containers/TabDetail'; // import Members from 'pages/compute/containers/Instance'; -import { powerState, provisioningState } from 'resources/ironic'; +import { powerState, provisioningState } from 'resources/ironic/ironic'; import BaseDetail from './BaseDetail'; import Port from './Port'; import PortGroup from './PortGroup'; diff --git a/src/pages/compute/containers/BareMetalNode/actions/Create/index.jsx b/src/pages/compute/containers/BareMetalNode/actions/Create/index.jsx index a9e84ba5..212c766e 100644 --- a/src/pages/compute/containers/BareMetalNode/actions/Create/index.jsx +++ b/src/pages/compute/containers/BareMetalNode/actions/Create/index.jsx @@ -21,7 +21,7 @@ import { updateObjToAddSelectArray, updateAddSelectValueToObj, } from 'utils/index'; -import { getDifFromAddSelectValue, hasValue } from 'resources/ironic'; +import { getDifFromAddSelectValue, hasValue } from 'resources/ironic/ironic'; import DriveInterface from './DriveInterface'; import DriveInfo from './DriveInfo'; import NodeInfo from './NodeInfo'; diff --git a/src/pages/compute/containers/BareMetalNode/actions/ManageState.jsx b/src/pages/compute/containers/BareMetalNode/actions/ManageState.jsx index b1c1a927..480c36f6 100644 --- a/src/pages/compute/containers/BareMetalNode/actions/ManageState.jsx +++ b/src/pages/compute/containers/BareMetalNode/actions/ManageState.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import globalIronicStore from 'stores/ironic/ironic'; import { ModalAction } from 'containers/Action'; -import { provisioningState, canChangeStatus } from 'resources/ironic'; +import { provisioningState, canChangeStatus } from 'resources/ironic/ironic'; import { getOptions } from 'utils/index'; @inject('rootStore') diff --git a/src/pages/compute/containers/BareMetalNode/index.jsx b/src/pages/compute/containers/BareMetalNode/index.jsx index e363ed9b..b9ad8eca 100644 --- a/src/pages/compute/containers/BareMetalNode/index.jsx +++ b/src/pages/compute/containers/BareMetalNode/index.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalIronicStore from 'stores/ironic/ironic'; -import { powerState, provisioningState } from 'resources/ironic'; +import { powerState, provisioningState } from 'resources/ironic/ironic'; import { ironicOriginEndpoint } from 'client/client/constants'; import { getOptions } from 'utils'; import actionConfigs from './actions'; diff --git a/src/pages/compute/containers/Flavor/Arm/index.jsx b/src/pages/compute/containers/Flavor/Arm/index.jsx index 4fc05ced..f78db597 100644 --- a/src/pages/compute/containers/Flavor/Arm/index.jsx +++ b/src/pages/compute/containers/Flavor/Arm/index.jsx @@ -21,7 +21,7 @@ import { getBaseColumns, extraColumns, armCategoryList, -} from 'resources/flavor'; +} from 'resources/nova/flavor'; import { getOptions } from 'utils/index'; import actionConfigs from './actions'; diff --git a/src/pages/compute/containers/Flavor/BareMetal/index.jsx b/src/pages/compute/containers/Flavor/BareMetal/index.jsx index bc311025..8a149e2c 100644 --- a/src/pages/compute/containers/Flavor/BareMetal/index.jsx +++ b/src/pages/compute/containers/Flavor/BareMetal/index.jsx @@ -20,7 +20,7 @@ import { flavorArchitectures, getBaseColumns, extraColumns, -} from 'resources/flavor'; +} from 'resources/nova/flavor'; import actionConfigs from './actions'; export class Flavor extends Base { diff --git a/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx b/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx index 313f2c5b..e5231031 100644 --- a/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx +++ b/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx @@ -24,7 +24,7 @@ import { cpuThreadPolicyMap, pageTypeMap, isBareMetal, -} from 'resources/flavor'; +} from 'resources/nova/flavor'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Flavor/Detail/index.jsx b/src/pages/compute/containers/Flavor/Detail/index.jsx index dd970373..f3bec3c2 100644 --- a/src/pages/compute/containers/Flavor/Detail/index.jsx +++ b/src/pages/compute/containers/Flavor/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { FlavorStore } from 'stores/nova/flavor'; import Base from 'containers/TabDetail'; -import { flavorCategoryList, flavorArchitectures } from 'resources/flavor'; +import { flavorCategoryList, flavorArchitectures } from 'resources/nova/flavor'; import Members from 'pages/compute/containers/Instance'; import { emptyActionConfig } from 'utils/constants'; import { formatSize } from 'utils'; diff --git a/src/pages/compute/containers/Flavor/Heterogeneous/index.jsx b/src/pages/compute/containers/Flavor/Heterogeneous/index.jsx index ac2bfa90..8230b7a5 100644 --- a/src/pages/compute/containers/Flavor/Heterogeneous/index.jsx +++ b/src/pages/compute/containers/Flavor/Heterogeneous/index.jsx @@ -22,7 +22,7 @@ import { extraColumns, heterogeneousCategoryList, gpuColumns, -} from 'resources/flavor'; +} from 'resources/nova/flavor'; import { getOptions } from 'utils/index'; import actionConfigs from './actions'; diff --git a/src/pages/compute/containers/Flavor/Other/index.jsx b/src/pages/compute/containers/Flavor/Other/index.jsx index 9e787959..99e85d13 100644 --- a/src/pages/compute/containers/Flavor/Other/index.jsx +++ b/src/pages/compute/containers/Flavor/Other/index.jsx @@ -16,7 +16,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import { FlavorStore } from 'stores/nova/flavor'; import { emptyActionConfig } from 'utils/constants'; -import { getBaseColumns, extraColumns } from 'resources/flavor'; +import { getBaseColumns, extraColumns } from 'resources/nova/flavor'; import actionConfigs from './actions'; export class Flavor extends Base { diff --git a/src/pages/compute/containers/Flavor/X86/index.jsx b/src/pages/compute/containers/Flavor/X86/index.jsx index 17e6b975..e3467805 100644 --- a/src/pages/compute/containers/Flavor/X86/index.jsx +++ b/src/pages/compute/containers/Flavor/X86/index.jsx @@ -21,7 +21,7 @@ import { getBaseColumns, extraColumns, x86CategoryList, -} from 'resources/flavor'; +} from 'resources/nova/flavor'; import { getOptions } from 'utils/index'; import actionConfigs from './actions'; diff --git a/src/pages/compute/containers/Flavor/actions/ManageAccess.jsx b/src/pages/compute/containers/Flavor/actions/ManageAccess.jsx index 1e42f7be..1798becd 100644 --- a/src/pages/compute/containers/Flavor/actions/ManageAccess.jsx +++ b/src/pages/compute/containers/Flavor/actions/ManageAccess.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import globalFlavorStore from 'stores/nova/flavor'; import { ModalAction } from 'containers/Action'; import { ProjectStore } from 'stores/keystone/project'; -import { projectTableOptions } from 'resources/project'; +import { projectTableOptions } from 'resources/keystone/project'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Flavor/actions/StepCreate/AccessTypeSetting.jsx b/src/pages/compute/containers/Flavor/actions/StepCreate/AccessTypeSetting.jsx index ceec6ad4..23836645 100644 --- a/src/pages/compute/containers/Flavor/actions/StepCreate/AccessTypeSetting.jsx +++ b/src/pages/compute/containers/Flavor/actions/StepCreate/AccessTypeSetting.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import Base from 'components/Form'; import { ProjectStore } from 'stores/keystone/project'; -import { projectTableOptions } from 'resources/project'; +import { projectTableOptions } from 'resources/keystone/project'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx b/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx index a456e633..8be478d7 100644 --- a/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx +++ b/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx @@ -30,7 +30,7 @@ import { getAllArchitecture, getFamilyItemValue, isGpuVisual, -} from 'resources/flavor'; +} from 'resources/nova/flavor'; import globalSettingStore from 'stores/skyline/setting'; import { getOptions } from 'utils/index'; import { parse } from 'qs'; diff --git a/src/pages/compute/containers/Flavor/actions/StepCreate/index.jsx b/src/pages/compute/containers/Flavor/actions/StepCreate/index.jsx index f8838ab0..368dc57b 100644 --- a/src/pages/compute/containers/Flavor/actions/StepCreate/index.jsx +++ b/src/pages/compute/containers/Flavor/actions/StepCreate/index.jsx @@ -22,7 +22,7 @@ import { isComputeOptimized, isGpuVisual, isBareMetal, -} from 'resources/flavor'; +} from 'resources/nova/flavor'; import { parse } from 'qs'; import AccessTypeSetting from './AccessTypeSetting'; import ParamSetting from './ParamSetting'; diff --git a/src/pages/compute/containers/Flavor/index.jsx b/src/pages/compute/containers/Flavor/index.jsx index 8f79b1d8..5166e4ac 100644 --- a/src/pages/compute/containers/Flavor/index.jsx +++ b/src/pages/compute/containers/Flavor/index.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/TabList'; import globalSettingStore from 'stores/skyline/setting'; -import { flavorArchitectures, getAllArchitecture } from 'resources/flavor'; +import { flavorArchitectures, getAllArchitecture } from 'resources/nova/flavor'; import X86 from './X86'; import Heterogeneous from './Heterogeneous'; import Arm from './Arm'; diff --git a/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx b/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx index 951304c8..48b1ca58 100644 --- a/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx +++ b/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import { AggregateStore } from 'stores/nova/aggregate'; import globalComputeHostStore from 'stores/nova/compute-host'; import { ModalAction } from 'containers/Action'; -import { serviceStatus, serviceState } from 'resources/service'; +import { serviceStatus, serviceState } from 'resources/nova/service'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx b/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx index 5490f815..3bfa9730 100644 --- a/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx +++ b/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx @@ -14,9 +14,9 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { serviceStatus, serviceState } from 'resources/service'; +import { serviceStatus, serviceState } from 'resources/nova/service'; import globalComputeHostStore from 'stores/nova/compute-host'; -import { onlyAdminCanReadPolicy } from 'resources/policy'; +import { onlyAdminCanReadPolicy } from 'resources/keystone/policy'; import { getOptions } from 'utils'; import actionConfigs from './actions'; diff --git a/src/pages/compute/containers/Hypervisors/Hypervisor/index.jsx b/src/pages/compute/containers/Hypervisors/Hypervisor/index.jsx index 45312b5b..85294b77 100644 --- a/src/pages/compute/containers/Hypervisors/Hypervisor/index.jsx +++ b/src/pages/compute/containers/Hypervisors/Hypervisor/index.jsx @@ -15,7 +15,10 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalHypervisorStore from 'stores/nova/hypervisor'; -import { hypervisorColumns, hypervisorFilters } from 'resources/hypervisor'; +import { + hypervisorColumns, + hypervisorFilters, +} from 'resources/nova/hypervisor'; export class Hypervisors extends Base { init() { diff --git a/src/pages/compute/containers/Image/Detail/BaseDetail.jsx b/src/pages/compute/containers/Image/Detail/BaseDetail.jsx index bf432562..f83955c3 100644 --- a/src/pages/compute/containers/Image/Detail/BaseDetail.jsx +++ b/src/pages/compute/containers/Image/Detail/BaseDetail.jsx @@ -14,7 +14,11 @@ import { toJS } from 'mobx'; import { inject, observer } from 'mobx-react'; -import { imageProperties, imageVisibility, imageOS } from 'resources/image'; +import { + imageProperties, + imageVisibility, + imageOS, +} from 'resources/glance/image'; import Base from 'containers/BaseDetail'; import { isObject, isArray } from 'lodash'; diff --git a/src/pages/compute/containers/Image/Detail/index.jsx b/src/pages/compute/containers/Image/Detail/index.jsx index 73735679..d0b33193 100644 --- a/src/pages/compute/containers/Image/Detail/index.jsx +++ b/src/pages/compute/containers/Image/Detail/index.jsx @@ -13,7 +13,7 @@ // limitations under the License. import { inject, observer } from 'mobx-react'; -import { imageStatus } from 'resources/image'; +import { imageStatus } from 'resources/glance/image'; import { ImageStore } from 'stores/glance/image'; import Base from 'containers/TabDetail'; import BaseDetail from './BaseDetail'; diff --git a/src/pages/compute/containers/Image/Image.jsx b/src/pages/compute/containers/Image/Image.jsx index c3c09f33..2168903b 100644 --- a/src/pages/compute/containers/Image/Image.jsx +++ b/src/pages/compute/containers/Image/Image.jsx @@ -22,7 +22,7 @@ import { imageUsage, imageFormats, transitionStatusList, -} from 'resources/image'; +} from 'resources/glance/image'; import { ImageStore } from 'stores/glance/image'; import { getOptions } from 'utils/index'; import actionConfigs from './actions'; diff --git a/src/pages/compute/containers/Image/actions/Create.jsx b/src/pages/compute/containers/Image/actions/Create.jsx index 8addebc6..7831860e 100644 --- a/src/pages/compute/containers/Image/actions/Create.jsx +++ b/src/pages/compute/containers/Image/actions/Create.jsx @@ -21,11 +21,11 @@ import { imageFormats, imageFormatsConsole, imageVisibility, -} from 'resources/image'; -import { cpuPolicyList, cpuThreadPolicyList } from 'resources/flavor'; +} from 'resources/glance/image'; +import { cpuPolicyList, cpuThreadPolicyList } from 'resources/nova/flavor'; import { NoSetValue, getOptionsWithNoSet, getOptions } from 'utils/index'; import { ProjectStore } from 'stores/keystone/project'; -import { projectTableOptions } from 'resources/project'; +import { projectTableOptions } from 'resources/keystone/project'; export class CreateForm extends FormAction { init() { diff --git a/src/pages/compute/containers/Image/actions/CreateInstance.jsx b/src/pages/compute/containers/Image/actions/CreateInstance.jsx index a2f8eb26..0e95d544 100644 --- a/src/pages/compute/containers/Image/actions/CreateInstance.jsx +++ b/src/pages/compute/containers/Image/actions/CreateInstance.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import CreateInstance from 'pages/compute/containers/Instance/actions/StepCreate'; -import { canImageCreateInstance } from 'resources/image'; +import { canImageCreateInstance } from 'resources/glance/image'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Image/actions/CreateIronic.jsx b/src/pages/compute/containers/Image/actions/CreateIronic.jsx index a55deaf4..5b73cda7 100644 --- a/src/pages/compute/containers/Image/actions/CreateIronic.jsx +++ b/src/pages/compute/containers/Image/actions/CreateIronic.jsx @@ -14,8 +14,8 @@ import { inject, observer } from 'mobx-react'; import CreateInstance from 'pages/compute/containers/Instance/actions/StepCreate'; -import { canImageCreateIronicInstance } from 'resources/image'; -import { canCreateIronicByEndpoint } from 'resources/instance'; +import { canImageCreateIronicInstance } from 'resources/glance/image'; +import { canCreateIronicByEndpoint } from 'resources/nova/instance'; export class CreateIronic extends CreateInstance { static id = 'ironic-create'; diff --git a/src/pages/compute/containers/Image/actions/Delete.jsx b/src/pages/compute/containers/Image/actions/Delete.jsx index 1755d442..960799b1 100644 --- a/src/pages/compute/containers/Image/actions/Delete.jsx +++ b/src/pages/compute/containers/Image/actions/Delete.jsx @@ -14,7 +14,7 @@ import { ConfirmAction } from 'containers/Action'; import globalImageStore from 'stores/glance/image'; -import { isOwner } from 'resources/image'; +import { isOwner } from 'resources/glance/image'; export default class DeleteAction extends ConfirmAction { get id() { diff --git a/src/pages/compute/containers/Image/actions/Edit.jsx b/src/pages/compute/containers/Image/actions/Edit.jsx index 1e90d96d..2d23badd 100644 --- a/src/pages/compute/containers/Image/actions/Edit.jsx +++ b/src/pages/compute/containers/Image/actions/Edit.jsx @@ -15,11 +15,11 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalImageStore from 'stores/glance/image'; -import { imageOS, isOwner } from 'resources/image'; +import { imageOS, isOwner } from 'resources/glance/image'; import { has, get } from 'lodash'; -import { isActive } from 'resources/instance'; +import { isActive } from 'resources/nova/instance'; import { NoSetValue, getOptionsWithNoSet } from 'utils/index'; -import { cpuPolicyList, cpuThreadPolicyList } from 'resources/flavor'; +import { cpuPolicyList, cpuThreadPolicyList } from 'resources/nova/flavor'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Image/actions/ManageAccess.jsx b/src/pages/compute/containers/Image/actions/ManageAccess.jsx index 40c921f1..59bb4e05 100644 --- a/src/pages/compute/containers/Image/actions/ManageAccess.jsx +++ b/src/pages/compute/containers/Image/actions/ManageAccess.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import globalImageStore, { ImageStore } from 'stores/glance/image'; import { ModalAction } from 'containers/Action'; import { ProjectStore } from 'stores/keystone/project'; -import { projectTableOptions } from 'resources/project'; +import { projectTableOptions } from 'resources/keystone/project'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Image/actions/ManageMetadata.jsx b/src/pages/compute/containers/Image/actions/ManageMetadata.jsx index e16141c3..cae30093 100644 --- a/src/pages/compute/containers/Image/actions/ManageMetadata.jsx +++ b/src/pages/compute/containers/Image/actions/ManageMetadata.jsx @@ -18,7 +18,7 @@ import { ModalAction } from 'containers/Action'; import KeyValueInput from 'components/FormItem/KeyValueInput'; import { MetadataStore } from 'stores/glance/metadata'; import { isEmpty, has } from 'lodash'; -import { isOwner } from 'resources/image'; +import { isOwner } from 'resources/glance/image'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Instance/Detail/ActionLog/index.jsx b/src/pages/compute/containers/Instance/Detail/ActionLog/index.jsx index 4c7b5b77..8cfd001a 100644 --- a/src/pages/compute/containers/Instance/Detail/ActionLog/index.jsx +++ b/src/pages/compute/containers/Instance/Detail/ActionLog/index.jsx @@ -1,7 +1,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalActionLogStore from 'stores/nova/action-log'; -import { actionColumn } from 'resources/instance'; +import { actionColumn } from 'resources/nova/instance'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx b/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx index 47665d7a..c96ee846 100644 --- a/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx +++ b/src/pages/compute/containers/Instance/Detail/BaseDetail/index.jsx @@ -35,7 +35,7 @@ import { instanceStatus, isIronicInstance, SimpleTag, -} from 'resources/instance'; +} from 'resources/nova/instance'; import { generateId } from 'utils/index'; import { getSinceTime, getLocalTimeStr } from 'utils/time'; import AttachVolume from 'pages/compute/containers/Instance/actions/AttachVolume'; diff --git a/src/pages/compute/containers/Instance/Detail/SecurityGroup/action/ManageSecurityGroup.jsx b/src/pages/compute/containers/Instance/Detail/SecurityGroup/action/ManageSecurityGroup.jsx index bd0faba5..d24a80ca 100644 --- a/src/pages/compute/containers/Instance/Detail/SecurityGroup/action/ManageSecurityGroup.jsx +++ b/src/pages/compute/containers/Instance/Detail/SecurityGroup/action/ManageSecurityGroup.jsx @@ -19,7 +19,7 @@ import { SecurityGroupStore } from 'stores/neutron/security-group'; import { securityGroupFilter, securityGroupColumns, -} from 'resources/security-group'; +} from 'resources/neutron/security-group'; export class ManageSecurityGroup extends ModalAction { static id = 'manage-security-group'; diff --git a/src/pages/compute/containers/Instance/Detail/SecurityGroup/index.jsx b/src/pages/compute/containers/Instance/Detail/SecurityGroup/index.jsx index 03118827..c3eea83e 100644 --- a/src/pages/compute/containers/Instance/Detail/SecurityGroup/index.jsx +++ b/src/pages/compute/containers/Instance/Detail/SecurityGroup/index.jsx @@ -32,7 +32,7 @@ import classnames from 'classnames'; import interfaceImg from 'asset/image/interface.png'; import { CaretRightOutlined } from '@ant-design/icons'; import ItemActionButtons from 'components/Tables/Base/ItemActionButtons'; -import { getSelfColumns } from 'resources/security-group-rule'; +import { getSelfColumns } from 'resources/neutron/security-group-rule'; import { isAdminPage } from 'utils/index'; import { getPath } from 'utils/route-map'; import styles from './index.less'; diff --git a/src/pages/compute/containers/Instance/Detail/index.jsx b/src/pages/compute/containers/Instance/Detail/index.jsx index 5831918d..96313cb6 100644 --- a/src/pages/compute/containers/Instance/Detail/index.jsx +++ b/src/pages/compute/containers/Instance/Detail/index.jsx @@ -17,7 +17,7 @@ import { instanceStatus, lockRender, isIronicInstance, -} from 'resources/instance'; +} from 'resources/nova/instance'; import { ServerStore } from 'stores/nova/instance'; import Base from 'containers/TabDetail'; import Volumes from 'pages/storage/containers/Volume'; diff --git a/src/pages/compute/containers/Instance/actions/AssociateFip.jsx b/src/pages/compute/containers/Instance/actions/AssociateFip.jsx index bf4b0bfd..32ecb173 100644 --- a/src/pages/compute/containers/Instance/actions/AssociateFip.jsx +++ b/src/pages/compute/containers/Instance/actions/AssociateFip.jsx @@ -16,13 +16,13 @@ import { inject, observer } from 'mobx-react'; import globalServerStore from 'stores/nova/instance'; import globalFloatingIpsStore from 'stores/neutron/floatingIp'; import { ModalAction } from 'containers/Action'; -import { isNotError } from 'resources/instance'; -import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/router'; +import { isNotError } from 'resources/nova/instance'; +import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/neutron/router'; import { getInterfaceWithReason, handleFixedIPChange, -} from 'resources/floatingip'; -import { getPortsAndReasons } from 'resources/port'; +} from 'resources/neutron/floatingip'; +import { getPortsAndReasons } from 'resources/neutron/port'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Instance/actions/AttachInterface.jsx b/src/pages/compute/containers/Instance/actions/AttachInterface.jsx index 0e991e6d..f869c809 100644 --- a/src/pages/compute/containers/Instance/actions/AttachInterface.jsx +++ b/src/pages/compute/containers/Instance/actions/AttachInterface.jsx @@ -22,7 +22,7 @@ import { isActiveOrShutOff, isNotLocked, isNotDeleting, -} from 'resources/instance'; +} from 'resources/nova/instance'; import { ipValidate } from 'utils/validate'; const { isIPv4, isIpv6, isIpInRangeAll } = ipValidate; diff --git a/src/pages/compute/containers/Instance/actions/AttachVolume.jsx b/src/pages/compute/containers/Instance/actions/AttachVolume.jsx index 705dfd71..35b2713b 100644 --- a/src/pages/compute/containers/Instance/actions/AttachVolume.jsx +++ b/src/pages/compute/containers/Instance/actions/AttachVolume.jsx @@ -16,8 +16,8 @@ import { inject, observer } from 'mobx-react'; import globalServerStore from 'stores/nova/instance'; import globalRootStore from 'stores/root'; import { ModalAction } from 'containers/Action'; -import { allowAttachVolumeInstance } from 'resources/instance'; -import { multiTip } from 'resources/volume'; +import { allowAttachVolumeInstance } from 'resources/nova/instance'; +import { multiTip } from 'resources/cinder/volume'; import { get as _get } from 'lodash'; export class AttachVolume extends ModalAction { diff --git a/src/pages/compute/containers/Instance/actions/ChangePassword.jsx b/src/pages/compute/containers/Instance/actions/ChangePassword.jsx index 6280cd2a..009624df 100644 --- a/src/pages/compute/containers/Instance/actions/ChangePassword.jsx +++ b/src/pages/compute/containers/Instance/actions/ChangePassword.jsx @@ -20,7 +20,7 @@ import { isNotLockedOrAdmin, checkStatus, isIronicInstance, -} from 'resources/instance'; +} from 'resources/nova/instance'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Instance/actions/Console.jsx b/src/pages/compute/containers/Instance/actions/Console.jsx index 96fc14de..7b0e8a56 100644 --- a/src/pages/compute/containers/Instance/actions/Console.jsx +++ b/src/pages/compute/containers/Instance/actions/Console.jsx @@ -14,7 +14,7 @@ import { ConfirmAction } from 'containers/Action'; import globalServerStore from 'stores/nova/instance'; -import { isActive, isIronicInstance } from 'resources/instance'; +import { isActive, isIronicInstance } from 'resources/nova/instance'; import i18n from 'core/i18n'; const { getLocale } = i18n; diff --git a/src/pages/compute/containers/Instance/actions/CreateIronic/BaseStep/index.jsx b/src/pages/compute/containers/Instance/actions/CreateIronic/BaseStep/index.jsx index e402acbc..73d740e6 100644 --- a/src/pages/compute/containers/Instance/actions/CreateIronic/BaseStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/CreateIronic/BaseStep/index.jsx @@ -22,7 +22,7 @@ import { getImageSystemTabs, getImageOS, getImageColumns, -} from 'resources/image'; +} from 'resources/glance/image'; import Base from 'components/Form'; import FlavorSelectTable from '../../../components/FlavorSelectTable'; diff --git a/src/pages/compute/containers/Instance/actions/CreateIronic/NetworkStep/index.jsx b/src/pages/compute/containers/Instance/actions/CreateIronic/NetworkStep/index.jsx index 05943780..50bdef91 100644 --- a/src/pages/compute/containers/Instance/actions/CreateIronic/NetworkStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/CreateIronic/NetworkStep/index.jsx @@ -23,11 +23,11 @@ import { SecurityGroupStore } from 'stores/neutron/security-group'; import { ipValidate } from 'utils/validate'; import Base from 'components/Form'; import NetworkSelect from 'components/FormItem/NetworkSelect'; -import { ipTypeOptions } from 'resources/network'; +import { ipTypeOptions } from 'resources/neutron/network'; import { securityGroupColumns, securityGroupFilter, -} from 'resources/security-group'; +} from 'resources/neutron/security-group'; import { getLinkRender } from 'utils/route-map'; // import EditYamlModal from 'components/Modals/EditYaml'; diff --git a/src/pages/compute/containers/Instance/actions/CreateIronic/index.jsx b/src/pages/compute/containers/Instance/actions/CreateIronic/index.jsx index e7f5ef4f..dca7ed53 100644 --- a/src/pages/compute/containers/Instance/actions/CreateIronic/index.jsx +++ b/src/pages/compute/containers/Instance/actions/CreateIronic/index.jsx @@ -21,7 +21,10 @@ import globalServerStore from 'stores/nova/instance'; import globalProjectStore from 'stores/keystone/project'; import classnames from 'classnames'; import { isEmpty, isFinite } from 'lodash'; -import { getUserData, canCreateIronicByEndpoint } from 'resources/instance'; +import { + getUserData, + canCreateIronicByEndpoint, +} from 'resources/nova/instance'; import { ironicOriginEndpoint } from 'client/client/constants'; import Notify from 'components/Notify'; import styles from './index.less'; diff --git a/src/pages/compute/containers/Instance/actions/CreateSnapshot.jsx b/src/pages/compute/containers/Instance/actions/CreateSnapshot.jsx index 095ce8c5..c72a6eeb 100644 --- a/src/pages/compute/containers/Instance/actions/CreateSnapshot.jsx +++ b/src/pages/compute/containers/Instance/actions/CreateSnapshot.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import globalServerStore from 'stores/nova/instance'; import { ModalAction } from 'containers/Action'; -import { checkStatus, isIronicInstance } from 'resources/instance'; +import { checkStatus, isIronicInstance } from 'resources/nova/instance'; import globalInstanceVolumeStore from 'stores/nova/instance-volume'; import globalVolumeTypeStore from 'stores/cinder/volume-type'; diff --git a/src/pages/compute/containers/Instance/actions/DeleteIronic.jsx b/src/pages/compute/containers/Instance/actions/DeleteIronic.jsx index ec82c995..2d7bc708 100644 --- a/src/pages/compute/containers/Instance/actions/DeleteIronic.jsx +++ b/src/pages/compute/containers/Instance/actions/DeleteIronic.jsx @@ -14,7 +14,7 @@ import { ConfirmAction } from 'containers/Action'; import globalServerStore from 'stores/nova/instance'; -import { isIronicInstance, isNotLockedOrAdmin } from 'resources/instance'; +import { isIronicInstance, isNotLockedOrAdmin } from 'resources/nova/instance'; export default class Delete extends ConfirmAction { get id() { diff --git a/src/pages/compute/containers/Instance/actions/DetachInterface.jsx b/src/pages/compute/containers/Instance/actions/DetachInterface.jsx index 28af180a..3482aa1f 100644 --- a/src/pages/compute/containers/Instance/actions/DetachInterface.jsx +++ b/src/pages/compute/containers/Instance/actions/DetachInterface.jsx @@ -16,8 +16,8 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import { ServerStore } from 'stores/nova/instance'; import { ModalAction } from 'containers/Action'; -import { portStatus } from 'resources/port'; -import { isActiveOrShutOff, isNotLocked } from 'resources/instance'; +import { portStatus } from 'resources/neutron/port'; +import { isActiveOrShutOff, isNotLocked } from 'resources/nova/instance'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Instance/actions/DetachVolume.jsx b/src/pages/compute/containers/Instance/actions/DetachVolume.jsx index 36db419d..8072e18a 100644 --- a/src/pages/compute/containers/Instance/actions/DetachVolume.jsx +++ b/src/pages/compute/containers/Instance/actions/DetachVolume.jsx @@ -17,8 +17,8 @@ import { VolumeStore } from 'stores/cinder/volume'; import globalServerStore from 'stores/nova/instance'; import globalRootStore from 'stores/root'; import { ModalAction } from 'containers/Action'; -import { volumeStatus, isOsDisk } from 'resources/volume'; -import { allowAttachVolumeInstance } from 'resources/instance'; +import { volumeStatus, isOsDisk } from 'resources/cinder/volume'; +import { allowAttachVolumeInstance } from 'resources/nova/instance'; export class DetachVolume extends ModalAction { static id = 'detach-volume'; diff --git a/src/pages/compute/containers/Instance/actions/LiveMigrate.jsx b/src/pages/compute/containers/Instance/actions/LiveMigrate.jsx index f9f42f4a..aa658129 100644 --- a/src/pages/compute/containers/Instance/actions/LiveMigrate.jsx +++ b/src/pages/compute/containers/Instance/actions/LiveMigrate.jsx @@ -20,9 +20,12 @@ import { isNotDeleting, isIronicInstance, isPaused, -} from 'resources/instance'; +} from 'resources/nova/instance'; import globalHypervisorStore from 'stores/nova/hypervisor'; -import { hypervisorColumns, hypervisorFilters } from 'resources/hypervisor'; +import { + hypervisorColumns, + hypervisorFilters, +} from 'resources/nova/hypervisor'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Instance/actions/Lock.jsx b/src/pages/compute/containers/Instance/actions/Lock.jsx index 18749126..8cc0e5bd 100644 --- a/src/pages/compute/containers/Instance/actions/Lock.jsx +++ b/src/pages/compute/containers/Instance/actions/Lock.jsx @@ -14,7 +14,7 @@ import { ConfirmAction } from 'containers/Action'; import { isArray } from 'lodash'; -import { isNotLocked } from 'resources/instance'; +import { isNotLocked } from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class LockAction extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/actions/ManageSecurityGroup.jsx b/src/pages/compute/containers/Instance/actions/ManageSecurityGroup.jsx index a3db4f87..5e85230f 100644 --- a/src/pages/compute/containers/Instance/actions/ManageSecurityGroup.jsx +++ b/src/pages/compute/containers/Instance/actions/ManageSecurityGroup.jsx @@ -19,11 +19,11 @@ import globalServerStore from 'stores/nova/instance'; import { VirtualAdapterStore } from 'stores/neutron/virtual-adapter'; import { PortStore } from 'stores/neutron/port'; import { SecurityGroupStore } from 'stores/neutron/security-group'; -import { portStatus } from 'resources/port'; +import { portStatus } from 'resources/neutron/port'; import { securityGroupColumns, securityGroupFilter, -} from 'resources/security-group'; +} from 'resources/neutron/security-group'; import { toJS } from 'mobx'; @inject('rootStore') diff --git a/src/pages/compute/containers/Instance/actions/Migrate.jsx b/src/pages/compute/containers/Instance/actions/Migrate.jsx index 846e11fb..ed37c1a5 100644 --- a/src/pages/compute/containers/Instance/actions/Migrate.jsx +++ b/src/pages/compute/containers/Instance/actions/Migrate.jsx @@ -20,9 +20,12 @@ import { isNotDeleting, isIronicInstance, isStopped, -} from 'resources/instance'; +} from 'resources/nova/instance'; import globalHypervisorStore from 'stores/nova/hypervisor'; -import { hypervisorColumns, hypervisorFilters } from 'resources/hypervisor'; +import { + hypervisorColumns, + hypervisorFilters, +} from 'resources/nova/hypervisor'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/Instance/actions/Pause.jsx b/src/pages/compute/containers/Instance/actions/Pause.jsx index 2943c24f..c3c684a6 100644 --- a/src/pages/compute/containers/Instance/actions/Pause.jsx +++ b/src/pages/compute/containers/Instance/actions/Pause.jsx @@ -14,7 +14,11 @@ import { ConfirmAction } from 'containers/Action'; import { isArray } from 'lodash'; -import { isNotLocked, checkStatus, isIronicInstance } from 'resources/instance'; +import { + isNotLocked, + checkStatus, + isIronicInstance, +} from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class PauseAction extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/actions/Reboot.jsx b/src/pages/compute/containers/Instance/actions/Reboot.jsx index 0d60a844..f39414ef 100644 --- a/src/pages/compute/containers/Instance/actions/Reboot.jsx +++ b/src/pages/compute/containers/Instance/actions/Reboot.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { ConfirmAction } from 'containers/Action'; import { isArray } from 'lodash'; -import { isNotLockedOrAdmin, checkStatus } from 'resources/instance'; +import { isNotLockedOrAdmin, checkStatus } from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class RebootAction extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/actions/Rebuild.jsx b/src/pages/compute/containers/Instance/actions/Rebuild.jsx index e8a72144..6e67f181 100644 --- a/src/pages/compute/containers/Instance/actions/Rebuild.jsx +++ b/src/pages/compute/containers/Instance/actions/Rebuild.jsx @@ -18,7 +18,7 @@ import { isActiveOrShutOff, isNotLockedOrAdmin, isIsoInstance, -} from 'resources/instance'; +} from 'resources/nova/instance'; export default class Rebuild extends ConfirmAction { get id() { diff --git a/src/pages/compute/containers/Instance/actions/RebuildSelect.jsx b/src/pages/compute/containers/Instance/actions/RebuildSelect.jsx index a16e9c04..8c9d39a7 100644 --- a/src/pages/compute/containers/Instance/actions/RebuildSelect.jsx +++ b/src/pages/compute/containers/Instance/actions/RebuildSelect.jsx @@ -20,13 +20,13 @@ import { isActiveOrShutOff, isNotLocked, isIsoInstance, -} from 'resources/instance'; +} from 'resources/nova/instance'; import { getImageOS, getImageColumns, canImageCreateInstance, getImageSystemTabs, -} from 'resources/image'; +} from 'resources/glance/image'; export class Rebuild extends ModalAction { static id = 'rebuild'; diff --git a/src/pages/compute/containers/Instance/actions/Resize.jsx b/src/pages/compute/containers/Instance/actions/Resize.jsx index 08bbe633..a5cf2129 100644 --- a/src/pages/compute/containers/Instance/actions/Resize.jsx +++ b/src/pages/compute/containers/Instance/actions/Resize.jsx @@ -21,7 +21,7 @@ import { isNotLockedOrAdmin, checkStatus, isIronicInstance, -} from 'resources/instance'; +} from 'resources/nova/instance'; import FlavorSelectTable from '../components/FlavorSelectTable'; export class Resize extends ModalAction { diff --git a/src/pages/compute/containers/Instance/actions/ResizeOnline.jsx b/src/pages/compute/containers/Instance/actions/ResizeOnline.jsx index 0632bddd..a231b4bd 100644 --- a/src/pages/compute/containers/Instance/actions/ResizeOnline.jsx +++ b/src/pages/compute/containers/Instance/actions/ResizeOnline.jsx @@ -22,7 +22,7 @@ import { checkStatus, isIronicInstance, hasOnlineResizeFlavor, -} from 'resources/instance'; +} from 'resources/nova/instance'; import FlavorSelectTable from '../components/FlavorSelectTable'; export class ResizeOnline extends ModalAction { diff --git a/src/pages/compute/containers/Instance/actions/Resume.jsx b/src/pages/compute/containers/Instance/actions/Resume.jsx index 08c0f3cb..f6a7ee92 100644 --- a/src/pages/compute/containers/Instance/actions/Resume.jsx +++ b/src/pages/compute/containers/Instance/actions/Resume.jsx @@ -14,7 +14,7 @@ import { ConfirmAction } from 'containers/Action'; import { isArray } from 'lodash'; -import { isNotLockedOrAdmin, checkStatus } from 'resources/instance'; +import { isNotLockedOrAdmin, checkStatus } from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class ResumeAction extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/actions/Shelve.jsx b/src/pages/compute/containers/Instance/actions/Shelve.jsx index 60977d7d..c35b1f6b 100644 --- a/src/pages/compute/containers/Instance/actions/Shelve.jsx +++ b/src/pages/compute/containers/Instance/actions/Shelve.jsx @@ -18,7 +18,7 @@ import { isNotLockedOrAdmin, checkStatus, isIronicInstance, -} from 'resources/instance'; +} from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; import styles from './index.less'; diff --git a/src/pages/compute/containers/Instance/actions/SoftDelete.jsx b/src/pages/compute/containers/Instance/actions/SoftDelete.jsx index 6636c568..66852da9 100644 --- a/src/pages/compute/containers/Instance/actions/SoftDelete.jsx +++ b/src/pages/compute/containers/Instance/actions/SoftDelete.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { ConfirmAction } from 'containers/Action'; import { isArray } from 'lodash'; -import { isNotLockedOrAdmin, isIronicInstance } from 'resources/instance'; +import { isNotLockedOrAdmin, isIronicInstance } from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; import { Checkbox, Tooltip } from 'antd'; import { diff --git a/src/pages/compute/containers/Instance/actions/SoftReboot.jsx b/src/pages/compute/containers/Instance/actions/SoftReboot.jsx index a5cb5b81..18a45eda 100644 --- a/src/pages/compute/containers/Instance/actions/SoftReboot.jsx +++ b/src/pages/compute/containers/Instance/actions/SoftReboot.jsx @@ -19,7 +19,7 @@ import { isNotLockedOrAdmin, checkStatus, isIronicInstance, -} from 'resources/instance'; +} from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class SoftRebootAction extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/actions/Start.jsx b/src/pages/compute/containers/Instance/actions/Start.jsx index 4643723a..669e54f4 100644 --- a/src/pages/compute/containers/Instance/actions/Start.jsx +++ b/src/pages/compute/containers/Instance/actions/Start.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { ConfirmAction } from 'containers/Action'; import { isArray } from 'lodash'; -import { isNotLockedOrAdmin, checkStatus } from 'resources/instance'; +import { isNotLockedOrAdmin, checkStatus } from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class StartAction extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx index 2a4e87a2..25954535 100644 --- a/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import { toJS } from 'mobx'; -import { volumeStatus, canCreateInstance } from 'resources/volume'; +import { volumeStatus, canCreateInstance } from 'resources/cinder/volume'; import globalServerStore from 'stores/nova/instance'; import globalImageStore from 'stores/glance/image'; import globalVolumeTypeStore from 'stores/cinder/volume-type'; @@ -26,10 +26,10 @@ import { getImageSystemTabs, getImageOS, getImageColumns, -} from 'resources/image'; +} from 'resources/glance/image'; import Base from 'components/Form'; import InstanceVolume from 'components/FormItem/InstanceVolume'; -import { isGpuCategory } from 'resources/flavor'; +import { isGpuCategory } from 'resources/nova/flavor'; import FlavorSelectTable from '../../../components/FlavorSelectTable'; export class BaseStep extends Base { diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/ConfirmStep/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/ConfirmStep/index.jsx index 51e7fbad..95758ebb 100644 --- a/src/pages/compute/containers/Instance/actions/StepCreate/ConfirmStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/StepCreate/ConfirmStep/index.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import Base from 'components/Form'; -import { physicalNodeTypes } from 'resources/instance'; +import { physicalNodeTypes } from 'resources/nova/instance'; import { Col, Row } from 'antd'; export class ConfirmStep extends Base { diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/NetworkStep/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/NetworkStep/index.jsx index a5e9d20c..d271b9f6 100644 --- a/src/pages/compute/containers/Instance/actions/StepCreate/NetworkStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/StepCreate/NetworkStep/index.jsx @@ -22,12 +22,12 @@ import { VirtualAdapterStore } from 'stores/neutron/virtual-adapter'; import { ipValidate } from 'utils/validate'; import Base from 'components/Form'; import NetworkSelect from 'components/FormItem/NetworkSelect'; -import { ipTypeOptions } from 'resources/network'; +import { ipTypeOptions } from 'resources/neutron/network'; import { securityGroupColumns, securityGroupFilter, -} from 'resources/security-group'; -import { portColumns, portFilters } from 'resources/port'; +} from 'resources/neutron/security-group'; +import { portColumns, portFilters } from 'resources/neutron/port'; import { getLinkRender } from 'utils/route-map'; // import EditYamlModal from 'components/Modals/EditYaml'; diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx index e1b919f1..92430fab 100644 --- a/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx @@ -17,11 +17,14 @@ import globalKeyPairStore from 'stores/nova/keypair'; import globalServerStore from 'stores/nova/instance'; import globalHypervisorStore from 'stores/nova/hypervisor'; import globalServerGroupStore from 'stores/nova/server-group'; -import policyType from 'resources/server-group'; +import policyType from 'resources/nova/server-group'; import Base from 'components/Form'; import { getPasswordOtherRule, asciiValidator } from 'utils/validate'; -import { hypervisorColumns, hypervisorFilters } from 'resources/hypervisor'; -import { physicalNodeTypes } from 'resources/instance'; +import { + hypervisorColumns, + hypervisorFilters, +} from 'resources/nova/hypervisor'; +import { physicalNodeTypes } from 'resources/nova/instance'; import { getOptions } from 'utils'; export class SystemStep extends Base { diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/index.jsx index 3247799d..1ad0ada3 100644 --- a/src/pages/compute/containers/Instance/actions/StepCreate/index.jsx +++ b/src/pages/compute/containers/Instance/actions/StepCreate/index.jsx @@ -21,7 +21,7 @@ import globalServerStore from 'stores/nova/instance'; import globalProjectStore from 'stores/keystone/project'; import classnames from 'classnames'; import { isEmpty, isFinite, isString } from 'lodash'; -import { getUserData } from 'resources/instance'; +import { getUserData } from 'resources/nova/instance'; import Notify from 'components/Notify'; import styles from './index.less'; import ConfirmStep from './ConfirmStep'; diff --git a/src/pages/compute/containers/Instance/actions/Stop.jsx b/src/pages/compute/containers/Instance/actions/Stop.jsx index 17384499..a01ffdd4 100644 --- a/src/pages/compute/containers/Instance/actions/Stop.jsx +++ b/src/pages/compute/containers/Instance/actions/Stop.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { ConfirmAction } from 'containers/Action'; import { isArray } from 'lodash'; -import { isNotLockedOrAdmin, checkStatus } from 'resources/instance'; +import { isNotLockedOrAdmin, checkStatus } from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class Stop extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/actions/Suspend.jsx b/src/pages/compute/containers/Instance/actions/Suspend.jsx index 4c6f1411..0d482eca 100644 --- a/src/pages/compute/containers/Instance/actions/Suspend.jsx +++ b/src/pages/compute/containers/Instance/actions/Suspend.jsx @@ -18,7 +18,7 @@ import { isNotLockedOrAdmin, checkStatus, isIronicInstance, -} from 'resources/instance'; +} from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class SuspendAction extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/actions/Unlock.jsx b/src/pages/compute/containers/Instance/actions/Unlock.jsx index 5eb911c9..fe61acf4 100644 --- a/src/pages/compute/containers/Instance/actions/Unlock.jsx +++ b/src/pages/compute/containers/Instance/actions/Unlock.jsx @@ -14,7 +14,7 @@ import { ConfirmAction } from 'containers/Action'; import { isArray } from 'lodash'; -import { isLocked } from 'resources/instance'; +import { isLocked } from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class UnlockAction extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/actions/Unpause.jsx b/src/pages/compute/containers/Instance/actions/Unpause.jsx index cff128e2..d9423791 100644 --- a/src/pages/compute/containers/Instance/actions/Unpause.jsx +++ b/src/pages/compute/containers/Instance/actions/Unpause.jsx @@ -14,7 +14,7 @@ import { ConfirmAction } from 'containers/Action'; import { isArray } from 'lodash'; -import { isNotLockedOrAdmin, checkStatus } from 'resources/instance'; +import { isNotLockedOrAdmin, checkStatus } from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class UnpauseAction extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/actions/Unshelve.jsx b/src/pages/compute/containers/Instance/actions/Unshelve.jsx index 48dd2158..fcbd56d6 100644 --- a/src/pages/compute/containers/Instance/actions/Unshelve.jsx +++ b/src/pages/compute/containers/Instance/actions/Unshelve.jsx @@ -13,7 +13,7 @@ // limitations under the License. import { ConfirmAction } from 'containers/Action'; -import { isNotLockedOrAdmin, checkStatus } from 'resources/instance'; +import { isNotLockedOrAdmin, checkStatus } from 'resources/nova/instance'; import globalServerStore from 'stores/nova/instance'; export default class Unshelve extends ConfirmAction { diff --git a/src/pages/compute/containers/Instance/components/FlavorSelectTable.jsx b/src/pages/compute/containers/Instance/components/FlavorSelectTable.jsx index ad700fb9..d5bf4fdc 100644 --- a/src/pages/compute/containers/Instance/components/FlavorSelectTable.jsx +++ b/src/pages/compute/containers/Instance/components/FlavorSelectTable.jsx @@ -29,7 +29,7 @@ import { isBareMetalFlavor, isBareMetal, getFlavorArchInfo, -} from 'resources/flavor'; +} from 'resources/nova/flavor'; import styles from './index.less'; export class FlavorSelectTable extends Component { diff --git a/src/pages/compute/containers/Instance/index.jsx b/src/pages/compute/containers/Instance/index.jsx index 93dd8f49..34ec3bad 100644 --- a/src/pages/compute/containers/Instance/index.jsx +++ b/src/pages/compute/containers/Instance/index.jsx @@ -23,7 +23,7 @@ import { instanceStatusFilter, isIronicInstance, SimpleTag, -} from 'resources/instance'; +} from 'resources/nova/instance'; import globalServerStore, { ServerStore } from 'stores/nova/instance'; import { ServerGroupInstanceStore } from 'stores/skyline/server-group-instance'; import actionConfigs from './actions'; diff --git a/src/pages/compute/containers/ServerGroup/Detail/index.jsx b/src/pages/compute/containers/ServerGroup/Detail/index.jsx index 1b1e370e..c1c4f087 100644 --- a/src/pages/compute/containers/ServerGroup/Detail/index.jsx +++ b/src/pages/compute/containers/ServerGroup/Detail/index.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import { ServerGroupStore } from 'stores/nova/server-group'; import Base from 'containers/TabDetail'; import Members from 'pages/compute/containers/Instance'; -import policyType from 'resources/server-group'; +import policyType from 'resources/nova/server-group'; import actionConfigs from '../actions'; @inject('rootStore') diff --git a/src/pages/compute/containers/ServerGroup/actions/Create.jsx b/src/pages/compute/containers/ServerGroup/actions/Create.jsx index 16c0a4c3..fe68770d 100644 --- a/src/pages/compute/containers/ServerGroup/actions/Create.jsx +++ b/src/pages/compute/containers/ServerGroup/actions/Create.jsx @@ -16,7 +16,7 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import globalServerGroupStore from 'stores/nova/server-group'; import { ModalAction } from 'containers/Action'; -import policyType from 'resources/server-group'; +import policyType from 'resources/nova/server-group'; @inject('rootStore') @observer diff --git a/src/pages/compute/containers/ServerGroup/index.jsx b/src/pages/compute/containers/ServerGroup/index.jsx index 772ff3f7..112a8fe1 100644 --- a/src/pages/compute/containers/ServerGroup/index.jsx +++ b/src/pages/compute/containers/ServerGroup/index.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalServerGroupStore from 'stores/nova/server-group'; -import policyType from 'resources/server-group'; +import policyType from 'resources/nova/server-group'; import { getOptions } from 'utils'; import actionConfigs from './actions'; diff --git a/src/pages/configuration/containers/Setting/actions/View.jsx b/src/pages/configuration/containers/Setting/actions/View.jsx index fe2fe83a..9f1ed194 100644 --- a/src/pages/configuration/containers/Setting/actions/View.jsx +++ b/src/pages/configuration/containers/Setting/actions/View.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { ModalAction } from 'containers/Action'; import { inject, observer } from 'mobx-react'; -import { onlyAdminCanReadPolicy } from 'resources/policy'; +import { onlyAdminCanReadPolicy } from 'resources/keystone/policy'; import CodeEditor from 'components/CodeEditor'; export class View extends ModalAction { diff --git a/src/pages/configuration/containers/Setting/index.jsx b/src/pages/configuration/containers/Setting/index.jsx index d9b81b8a..ec59c15e 100644 --- a/src/pages/configuration/containers/Setting/index.jsx +++ b/src/pages/configuration/containers/Setting/index.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalSettingStore from 'stores/skyline/setting'; -import { onlyAdminCanReadPolicy } from 'resources/policy'; +import { onlyAdminCanReadPolicy } from 'resources/keystone/policy'; import actionConfigs from './actions'; export class Setting extends Base { diff --git a/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx b/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx index 60ef59ba..cfd07c1c 100644 --- a/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx +++ b/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { serviceStatus, serviceState } from 'resources/service'; +import { serviceStatus, serviceState } from 'resources/nova/service'; import globalServiceStore from 'stores/cinder/service'; import { getOptions } from 'utils'; import actionConfigs from './actions'; diff --git a/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx b/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx index c2c88442..aafa794a 100644 --- a/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx +++ b/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { serviceStatus, serviceState } from 'resources/service'; +import { serviceStatus, serviceState } from 'resources/nova/service'; import { ComputeHostStore } from 'stores/nova/compute-host'; import { getOptions } from 'utils'; import actionConfigs from './actions'; diff --git a/src/pages/configuration/containers/SystemInfo/HeatService.jsx b/src/pages/configuration/containers/SystemInfo/HeatService.jsx index 3a62e8e1..3a9e36af 100644 --- a/src/pages/configuration/containers/SystemInfo/HeatService.jsx +++ b/src/pages/configuration/containers/SystemInfo/HeatService.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { serviceState } from 'resources/service'; +import { serviceState } from 'resources/nova/service'; import { getOptions } from 'utils'; import globalHeatServiceStore from 'stores/heat/service'; diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Add.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Add.jsx index 8a57a51f..6befe7c2 100644 --- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Add.jsx +++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/actions/Add.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import { NetworkStore } from 'stores/neutron/network'; import globalNeutronAgentNetworkStore from 'stores/neutron/agent-network'; import { ModalAction } from 'containers/Action'; -import { networkColumns, networkSortProps } from 'resources/network'; +import { networkColumns, networkSortProps } from 'resources/neutron/network'; import { yesNoOptions } from 'utils/constants'; import { projectRender } from 'utils/table'; diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/index.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/index.jsx index f62047ec..6a50c216 100644 --- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/index.jsx +++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Network/index.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { networkColumns } from 'resources/network'; +import { networkColumns } from 'resources/neutron/network'; import { NeutronAgentNetworkStore } from 'stores/neutron/agent-network'; import { yesNoOptions } from 'utils/constants'; import actionConfigs from './actions'; diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Add.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Add.jsx index 470f75b5..2289b0f3 100644 --- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Add.jsx +++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/actions/Add.jsx @@ -20,7 +20,7 @@ import { getRouterColumns, routerFilters, routerSortProps, -} from 'resources/router'; +} from 'resources/neutron/router'; import { projectRender } from 'utils/table'; @inject('rootStore') diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/index.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/index.jsx index 20fe9e8f..068e04a7 100644 --- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/index.jsx +++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/Router/index.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { getRouterColumns, routerFilters } from 'resources/router'; +import { getRouterColumns, routerFilters } from 'resources/neutron/router'; import { NeutronAgentRouterStore } from 'stores/neutron/agent-router'; import actionConfigs from './actions'; diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/index.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/index.jsx index 9a326805..e2592a2e 100644 --- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/index.jsx +++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/Detail/index.jsx @@ -18,7 +18,7 @@ import Base from 'containers/TabDetail'; import { getNeutronAgentServiceState, getNeutronAgentServiceStatus, -} from 'resources/service'; +} from 'resources/nova/service'; import BaseDetail from './BaseDetail'; import Router from './Router'; import Network from './Network'; diff --git a/src/pages/configuration/containers/SystemInfo/NeutronAgent/index.jsx b/src/pages/configuration/containers/SystemInfo/NeutronAgent/index.jsx index 51f59bf2..d4097c87 100644 --- a/src/pages/configuration/containers/SystemInfo/NeutronAgent/index.jsx +++ b/src/pages/configuration/containers/SystemInfo/NeutronAgent/index.jsx @@ -17,7 +17,7 @@ import Base from 'containers/List'; import { getNeutronAgentServiceState, getNeutronAgentServiceStatus, -} from 'resources/service'; +} from 'resources/nova/service'; import globalNeutronAgentStore from 'stores/neutron/agent'; import actionConfigs from './actions'; diff --git a/src/pages/database/containers/Instances/Detail/BaseDetail.jsx b/src/pages/database/containers/Instances/Detail/BaseDetail.jsx index ebf5ac5f..076e30e0 100644 --- a/src/pages/database/containers/Instances/Detail/BaseDetail.jsx +++ b/src/pages/database/containers/Instances/Detail/BaseDetail.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/BaseDetail'; -import { InstanceStatus, policyType } from 'resources/database'; +import { InstanceStatus, policyType } from 'resources/trove/database'; export class BaseDetail extends Base { get leftCards() { diff --git a/src/pages/database/containers/Instances/Detail/index.jsx b/src/pages/database/containers/Instances/Detail/index.jsx index edcc2ff9..dd309ed0 100644 --- a/src/pages/database/containers/Instances/Detail/index.jsx +++ b/src/pages/database/containers/Instances/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/TabDetail'; import globalInstancesStore from 'stores/trove/instances'; -import { InstanceStatus } from 'resources/database'; +import { InstanceStatus } from 'resources/trove/database'; import BaseDetail from './BaseDetail'; import Users from './Users'; import Databases from './Databases'; diff --git a/src/pages/database/containers/Instances/index.jsx b/src/pages/database/containers/Instances/index.jsx index 975c0fa4..10187f5f 100644 --- a/src/pages/database/containers/Instances/index.jsx +++ b/src/pages/database/containers/Instances/index.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalInstancesStore from 'stores/trove/instances'; -import { InstanceStatus } from 'resources/database'; +import { InstanceStatus } from 'resources/trove/database'; import { get as _get } from 'lodash'; import actions from './actions'; diff --git a/src/pages/heat/containers/Stack/Detail/BaseDetail.jsx b/src/pages/heat/containers/Stack/Detail/BaseDetail.jsx index a38675c1..29d03f8e 100644 --- a/src/pages/heat/containers/Stack/Detail/BaseDetail.jsx +++ b/src/pages/heat/containers/Stack/Detail/BaseDetail.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import Base from 'containers/BaseDetail'; -import { rollbackTip } from 'resources/stack'; +import { rollbackTip } from 'resources/heat/stack'; @inject('rootStore') @observer diff --git a/src/pages/heat/containers/Stack/Detail/Event.jsx b/src/pages/heat/containers/Stack/Detail/Event.jsx index 9e2a29b8..b145d82e 100644 --- a/src/pages/heat/containers/Stack/Detail/Event.jsx +++ b/src/pages/heat/containers/Stack/Detail/Event.jsx @@ -16,7 +16,7 @@ import React from 'react'; import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import { StackEventStore } from 'stores/heat/event'; -import { stackStatus } from 'resources/stack'; +import { stackStatus } from 'resources/heat/stack'; @inject('rootStore') @observer diff --git a/src/pages/heat/containers/Stack/Detail/Resource.jsx b/src/pages/heat/containers/Stack/Detail/Resource.jsx index f94fff26..9e2e9bea 100644 --- a/src/pages/heat/containers/Stack/Detail/Resource.jsx +++ b/src/pages/heat/containers/Stack/Detail/Resource.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import { StackResourceStore } from 'stores/heat/resource'; -import { stackStatus } from 'resources/stack'; +import { stackStatus } from 'resources/heat/stack'; export class Resource extends Base { init() { diff --git a/src/pages/heat/containers/Stack/Detail/index.jsx b/src/pages/heat/containers/Stack/Detail/index.jsx index 80988739..015badad 100644 --- a/src/pages/heat/containers/Stack/Detail/index.jsx +++ b/src/pages/heat/containers/Stack/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/TabDetail'; import { StackStore } from 'stores/heat/stack'; -import { stackStatus } from 'resources/stack'; +import { stackStatus } from 'resources/heat/stack'; import BaseDetail from './BaseDetail'; import Resource from './Resource'; import Event from './Event'; diff --git a/src/pages/heat/containers/Stack/actions/Create/Parameter.jsx b/src/pages/heat/containers/Stack/actions/Create/Parameter.jsx index b0714c13..a52a0d13 100644 --- a/src/pages/heat/containers/Stack/actions/Create/Parameter.jsx +++ b/src/pages/heat/containers/Stack/actions/Create/Parameter.jsx @@ -20,7 +20,7 @@ import { getFormDefaultValues, getTemplate, rollbackTip, -} from 'resources/stack'; +} from 'resources/heat/stack'; export class Parameter extends Base { get isStep() { diff --git a/src/pages/heat/containers/Stack/actions/Create/Template.jsx b/src/pages/heat/containers/Stack/actions/Create/Template.jsx index 66defe61..deab663b 100644 --- a/src/pages/heat/containers/Stack/actions/Create/Template.jsx +++ b/src/pages/heat/containers/Stack/actions/Create/Template.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import Base from 'components/Form'; -import { yamlTip, validateYaml, paramTip } from 'resources/stack'; +import { yamlTip, validateYaml, paramTip } from 'resources/heat/stack'; export class Template extends Base { get isStep() { diff --git a/src/pages/heat/containers/Stack/actions/Create/index.jsx b/src/pages/heat/containers/Stack/actions/Create/index.jsx index 5e28fa33..668620b3 100644 --- a/src/pages/heat/containers/Stack/actions/Create/index.jsx +++ b/src/pages/heat/containers/Stack/actions/Create/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { StepAction } from 'containers/Action'; import globalStackStore from 'stores/heat/stack'; -import { getYaml } from 'resources/stack'; +import { getYaml } from 'resources/heat/stack'; import { toJS } from 'mobx'; import Parameter from './Parameter'; import Template from './Template'; diff --git a/src/pages/heat/containers/Stack/index.jsx b/src/pages/heat/containers/Stack/index.jsx index 0652f5eb..aedcad4d 100644 --- a/src/pages/heat/containers/Stack/index.jsx +++ b/src/pages/heat/containers/Stack/index.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalStackStore, { StackStore } from 'stores/heat/stack'; -import { stackStatus } from 'resources/stack'; +import { stackStatus } from 'resources/heat/stack'; import actionConfigs from './actions'; export class Stack extends Base { diff --git a/src/pages/identity/containers/Project/index.jsx b/src/pages/identity/containers/Project/index.jsx index 13567de6..191524b2 100644 --- a/src/pages/identity/containers/Project/index.jsx +++ b/src/pages/identity/containers/Project/index.jsx @@ -18,7 +18,7 @@ import { Divider, Badge } from 'antd'; import Base from 'containers/List'; import globalProjectStore, { ProjectStore } from 'stores/keystone/project'; import { yesNoOptions, emptyActionConfig } from 'utils/constants'; -import { SimpleTag } from 'resources/instance'; +import { SimpleTag } from 'resources/nova/instance'; import actionConfigs from './actions'; import styles from './index.less'; diff --git a/src/pages/identity/containers/Role/Detail/BaseDetail.jsx b/src/pages/identity/containers/Role/Detail/BaseDetail.jsx index 644e4d75..0de02556 100644 --- a/src/pages/identity/containers/Role/Detail/BaseDetail.jsx +++ b/src/pages/identity/containers/Role/Detail/BaseDetail.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import globalRoleStore from 'stores/keystone/role'; import Base from 'containers/BaseDetail'; import { toJS } from 'mobx'; -import rolePermission from 'resources/role'; +import rolePermission from 'resources/keystone/role'; @inject('rootStore') @observer diff --git a/src/pages/monitor/containers/OtherService/components/Memcache/index.jsx b/src/pages/monitor/containers/OtherService/components/Memcache/index.jsx index d2244b8c..bd9eb902 100644 --- a/src/pages/monitor/containers/OtherService/components/Memcache/index.jsx +++ b/src/pages/monitor/containers/OtherService/components/Memcache/index.jsx @@ -16,7 +16,7 @@ import React from 'react'; import BaseContent from 'components/PrometheusChart/component/BaseContent'; import { getMemcacheNodes } from 'components/PrometheusChart/utils/fetchNodes'; import { ChartType } from 'components/PrometheusChart/utils/utils'; -import { getSuitableValue } from 'resources/monitoring'; +import { getSuitableValue } from 'resources/prometheus/monitoring'; const chartCardList = [ { diff --git a/src/pages/monitor/containers/Overview/config.jsx b/src/pages/monitor/containers/Overview/config.jsx index 95efb16c..bfc82dc5 100644 --- a/src/pages/monitor/containers/Overview/config.jsx +++ b/src/pages/monitor/containers/Overview/config.jsx @@ -6,7 +6,7 @@ import { cephStatusColorMap, cephStatusMap, getSuitableValue, -} from 'resources/monitoring'; +} from 'resources/prometheus/monitoring'; import CircleChart from 'components/PrometheusChart/CircleWithRightLegend'; import { handleResponses } from 'components/PrometheusChart/utils/dataHandler'; import { ChartType } from 'components/PrometheusChart/utils/utils'; diff --git a/src/pages/monitor/containers/PhysicalNode/index.jsx b/src/pages/monitor/containers/PhysicalNode/index.jsx index d3f56b2c..6b75eea2 100644 --- a/src/pages/monitor/containers/PhysicalNode/index.jsx +++ b/src/pages/monitor/containers/PhysicalNode/index.jsx @@ -18,7 +18,7 @@ import moment from 'moment'; import { Progress } from 'antd'; import BaseContent from 'components/PrometheusChart/component/BaseContent'; -import { getSuitableValue } from 'resources/monitoring'; +import { getSuitableValue } from 'resources/prometheus/monitoring'; import { ChartType } from 'components/PrometheusChart/utils/utils'; import { computePercentage, formatSize, formatUsedTime } from 'src/utils'; diff --git a/src/pages/monitor/containers/StorageCluster/index.jsx b/src/pages/monitor/containers/StorageCluster/index.jsx index f08cde77..7ab8f21c 100644 --- a/src/pages/monitor/containers/StorageCluster/index.jsx +++ b/src/pages/monitor/containers/StorageCluster/index.jsx @@ -21,7 +21,7 @@ import { cephStatusColorMap, cephStatusMap, getSuitableValue, -} from 'resources/monitoring'; +} from 'resources/prometheus/monitoring'; import CircleChart from 'components/PrometheusChart/CircleWithRightLegend'; import { handleResponses } from 'components/PrometheusChart/utils/dataHandler'; import { computePercentage } from 'src/utils'; diff --git a/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Edit.jsx b/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Edit.jsx index 8c1c171a..63185335 100644 --- a/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Edit.jsx +++ b/src/pages/network/containers/FloatingIp/Detail/PortForwarding/actions/Edit.jsx @@ -16,9 +16,9 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import globalPortForwardingStore from 'stores/neutron/port-forwarding'; import globalPortStore, { PortStore } from 'stores/neutron/port'; -import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/router'; -import { getInterfaceWithReason } from 'resources/floatingip'; -import { getPortFormItem, getPortsAndReasons } from 'resources/port'; +import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/neutron/router'; +import { getInterfaceWithReason } from 'resources/neutron/floatingip'; +import { getPortFormItem, getPortsAndReasons } from 'resources/neutron/port'; import { DesktopOutlined } from '@ant-design/icons'; import { ModalAction } from 'containers/Action'; diff --git a/src/pages/network/containers/FloatingIp/Detail/index.jsx b/src/pages/network/containers/FloatingIp/Detail/index.jsx index 39638f0a..89ddf217 100644 --- a/src/pages/network/containers/FloatingIp/Detail/index.jsx +++ b/src/pages/network/containers/FloatingIp/Detail/index.jsx @@ -14,10 +14,10 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/TabDetail'; -import { floatingIpStatus } from 'resources/floatingip'; +import { floatingIpStatus } from 'resources/neutron/floatingip'; import { FloatingIpStore } from 'stores/neutron/floatingIp'; import { isNull } from 'lodash'; -import { enablePFW } from 'resources/neutron'; +import { enablePFW } from 'resources/neutron/neutron'; import actionConfigs from '../actions'; import BaseDetail from './BaseDetail'; import PortForwarding from './PortForwarding'; diff --git a/src/pages/network/containers/FloatingIp/actions/Allocate.jsx b/src/pages/network/containers/FloatingIp/actions/Allocate.jsx index 881ea238..bba797ee 100644 --- a/src/pages/network/containers/FloatingIp/actions/Allocate.jsx +++ b/src/pages/network/containers/FloatingIp/actions/Allocate.jsx @@ -20,7 +20,7 @@ import { NetworkStore } from 'stores/neutron/network'; import globalProjectStore from 'stores/keystone/project'; import globalSubnetStore from 'stores/neutron/subnet'; import { QoSPolicyStore } from 'stores/neutron/qos-policy'; -import { getQoSPolicyTabs } from 'resources/qos-policy'; +import { getQoSPolicyTabs } from 'resources/neutron/qos-policy'; import { qosEndpoint } from 'client/client/constants'; export class Allocate extends ModalAction { diff --git a/src/pages/network/containers/FloatingIp/actions/Associate.jsx b/src/pages/network/containers/FloatingIp/actions/Associate.jsx index 1f1ed62d..497d602b 100644 --- a/src/pages/network/containers/FloatingIp/actions/Associate.jsx +++ b/src/pages/network/containers/FloatingIp/actions/Associate.jsx @@ -23,12 +23,12 @@ import { has, isNull } from 'lodash'; import { getRouterSelectTablePropsBackend, getCanReachSubnetIdsWithRouterIdInComponent, -} from 'resources/router'; +} from 'resources/neutron/router'; import globalFloatingIpsStore from 'stores/neutron/floatingIp'; import { PortStore } from 'stores/neutron/port'; -import { instanceSelectTablePropsBackend } from 'resources/instance'; -import { getPortFormItem, getPortsAndReasons } from 'resources/port'; -import { getInterfaceWithReason } from 'resources/floatingip'; +import { instanceSelectTablePropsBackend } from 'resources/nova/instance'; +import { getPortFormItem, getPortsAndReasons } from 'resources/neutron/port'; +import { getInterfaceWithReason } from 'resources/neutron/floatingip'; export class Associate extends ModalAction { static id = 'associate'; diff --git a/src/pages/network/containers/FloatingIp/actions/CreateDNAT.jsx b/src/pages/network/containers/FloatingIp/actions/CreateDNAT.jsx index 43c5b8b6..03444086 100644 --- a/src/pages/network/containers/FloatingIp/actions/CreateDNAT.jsx +++ b/src/pages/network/containers/FloatingIp/actions/CreateDNAT.jsx @@ -17,12 +17,12 @@ import { inject, observer } from 'mobx-react'; import { DesktopOutlined } from '@ant-design/icons'; import { ModalAction } from 'containers/Action'; import { isNull } from 'lodash'; -import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/router'; +import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/neutron/router'; import { PortStore } from 'stores/neutron/port'; -import { getPortFormItem, getPortsAndReasons } from 'resources/port'; -import { getInterfaceWithReason } from 'resources/floatingip'; +import { getPortFormItem, getPortsAndReasons } from 'resources/neutron/port'; +import { getInterfaceWithReason } from 'resources/neutron/floatingip'; import globalPortForwardingStore from 'stores/neutron/port-forwarding'; -import { enablePFW } from 'resources/neutron'; +import { enablePFW } from 'resources/neutron/neutron'; @inject('rootStore') @observer diff --git a/src/pages/network/containers/FloatingIp/actions/Edit.jsx b/src/pages/network/containers/FloatingIp/actions/Edit.jsx index c7e7f694..452d2059 100644 --- a/src/pages/network/containers/FloatingIp/actions/Edit.jsx +++ b/src/pages/network/containers/FloatingIp/actions/Edit.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalFloatingIpsStore from 'stores/neutron/floatingIp'; -import { getQoSPolicyTabs } from 'resources/qos-policy'; +import { getQoSPolicyTabs } from 'resources/neutron/qos-policy'; import { QoSPolicyStore } from 'stores/neutron/qos-policy'; import { qosEndpoint } from 'client/client/constants'; diff --git a/src/pages/network/containers/FloatingIp/index.jsx b/src/pages/network/containers/FloatingIp/index.jsx index 903c5b49..ce1a3db6 100644 --- a/src/pages/network/containers/FloatingIp/index.jsx +++ b/src/pages/network/containers/FloatingIp/index.jsx @@ -15,13 +15,16 @@ import React from 'react'; import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { floatingIpStatus, transitionStatuses } from 'resources/floatingip'; +import { + floatingIpStatus, + transitionStatuses, +} from 'resources/neutron/floatingip'; import { FloatingIpStore } from 'stores/neutron/floatingIp'; import { emptyActionConfig } from 'utils/constants'; import { Col, Popover, Row } from 'antd'; import { FileTextOutlined } from '@ant-design/icons'; import { qosEndpoint } from 'client/client/constants'; -import { enablePFW } from 'resources/neutron'; +import { enablePFW } from 'resources/neutron/neutron'; import { getOptions } from 'utils'; import styles from './styles.less'; import actionConfigs from './actions'; diff --git a/src/pages/network/containers/LoadBalancers/Listener/Actions/CreatePool.jsx b/src/pages/network/containers/LoadBalancers/Listener/Actions/CreatePool.jsx index 4045fb34..90c127c6 100644 --- a/src/pages/network/containers/LoadBalancers/Listener/Actions/CreatePool.jsx +++ b/src/pages/network/containers/LoadBalancers/Listener/Actions/CreatePool.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalPoolStore from 'stores/octavia/pool'; import globalLbaasStore from 'stores/octavia/loadbalancer'; -import { Algorithm, algorithmTip } from 'resources/pool'; +import { Algorithm, algorithmTip } from 'resources/octavia/pool'; @inject('rootStore') @observer diff --git a/src/pages/network/containers/LoadBalancers/Listener/Actions/EditHealthMonitor.jsx b/src/pages/network/containers/LoadBalancers/Listener/Actions/EditHealthMonitor.jsx index 054915d7..0d60e677 100644 --- a/src/pages/network/containers/LoadBalancers/Listener/Actions/EditHealthMonitor.jsx +++ b/src/pages/network/containers/LoadBalancers/Listener/Actions/EditHealthMonitor.jsx @@ -17,7 +17,7 @@ import { ModalAction } from 'containers/Action'; import globalHealthMonitorStore, { HealthMonitorStore, } from 'stores/octavia/health-monitor'; -import { BackendProtocol } from 'resources/pool'; +import { BackendProtocol } from 'resources/octavia/pool'; import { PoolStore } from 'stores/octavia/pool'; import globalLbaasStore from 'stores/octavia/loadbalancer'; diff --git a/src/pages/network/containers/LoadBalancers/Listener/Actions/EditPoolInfo.jsx b/src/pages/network/containers/LoadBalancers/Listener/Actions/EditPoolInfo.jsx index bae8ea38..71543560 100644 --- a/src/pages/network/containers/LoadBalancers/Listener/Actions/EditPoolInfo.jsx +++ b/src/pages/network/containers/LoadBalancers/Listener/Actions/EditPoolInfo.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalPoolStore from 'stores/octavia/pool'; -import { BackendProtocol, Algorithm } from 'resources/pool'; +import { BackendProtocol, Algorithm } from 'resources/octavia/pool'; import globalLbaasStore from 'stores/octavia/loadbalancer'; @inject('rootStore') diff --git a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/index.jsx b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/index.jsx index 1b4c7f4b..878f7715 100644 --- a/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/index.jsx +++ b/src/pages/network/containers/LoadBalancers/Listener/Detail/Member/index.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { provisioningStatusCodes } from 'resources/lb'; +import { provisioningStatusCodes } from 'resources/octavia/lb'; import globalPoolMemberStore from 'stores/octavia/pool-member'; import { actionConfigs, adminActions } from './Actions'; diff --git a/src/pages/network/containers/LoadBalancers/Listener/Detail/index.jsx b/src/pages/network/containers/LoadBalancers/Listener/Detail/index.jsx index e408ca2d..801f1e8e 100644 --- a/src/pages/network/containers/LoadBalancers/Listener/Detail/index.jsx +++ b/src/pages/network/containers/LoadBalancers/Listener/Detail/index.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import { ListenerStore } from 'stores/octavia/listener'; -import { provisioningStatusCodes } from 'resources/lb'; +import { provisioningStatusCodes } from 'resources/octavia/lb'; import Base from 'containers/TabDetail'; import BaseDetail from './BaseDetail'; import Members from './Member'; diff --git a/src/pages/network/containers/LoadBalancers/Listener/index.jsx b/src/pages/network/containers/LoadBalancers/Listener/index.jsx index b0586079..37e42e6f 100644 --- a/src/pages/network/containers/LoadBalancers/Listener/index.jsx +++ b/src/pages/network/containers/LoadBalancers/Listener/index.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { provisioningStatusCodes } from 'resources/lb'; +import { provisioningStatusCodes } from 'resources/octavia/lb'; import { ListenerStore } from 'stores/octavia/listener'; import { actionConfigs, adminActions } from './Actions'; diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/Detail/index.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/Detail/index.jsx index a3fc7e50..5b0d3134 100644 --- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/Detail/index.jsx +++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/TabDetail'; import { LbaasStore } from 'stores/octavia/loadbalancer'; -import { provisioningStatusCodes } from 'resources/lb'; +import { provisioningStatusCodes } from 'resources/octavia/lb'; import Listeners from '../../Listener'; import { actionConfigs, adminActions } from '../actions'; diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/AssociateFIP.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/AssociateFIP.jsx index bfe1856a..d95a62ac 100644 --- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/AssociateFIP.jsx +++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/AssociateFIP.jsx @@ -15,12 +15,12 @@ import { inject, observer } from 'mobx-react'; import globalFloatingIpsStore from 'stores/neutron/floatingIp'; import { ModalAction } from 'containers/Action'; -import { getPortsAndReasons } from 'resources/port'; +import { getPortsAndReasons } from 'resources/neutron/port'; import { getInterfaceWithReason, handleFixedIPChange, -} from 'resources/floatingip'; -import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/router'; +} from 'resources/neutron/floatingip'; +import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/neutron/router'; @inject('rootStore') @observer diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Delete.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Delete.jsx index 7d488823..b9b1a0f7 100644 --- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Delete.jsx +++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Delete.jsx @@ -13,7 +13,7 @@ // limitations under the License. import { ConfirmAction } from 'containers/Action'; -import { checkPolicyRule } from 'resources/policy'; +import { checkPolicyRule } from 'resources/keystone/policy'; import globalLbaasStore from 'stores/octavia/loadbalancer'; import globalRootStore from 'stores/root'; diff --git a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/index.jsx b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/index.jsx index 81ee8426..e349c789 100644 --- a/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/index.jsx +++ b/src/pages/network/containers/LoadBalancers/LoadBalancerInstance/index.jsx @@ -17,7 +17,10 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/List'; import { Col, Row } from 'antd'; import { LbaasStore } from 'stores/octavia/loadbalancer'; -import { operatingStatusCodes, provisioningStatusCodes } from 'resources/lb'; +import { + operatingStatusCodes, + provisioningStatusCodes, +} from 'resources/octavia/lb'; import { lbEndpoint } from 'client/client/constants'; import { actionConfigs, adminActions } from './actions'; diff --git a/src/pages/network/containers/LoadBalancers/StepCreateComponents/PoolStep/index.jsx b/src/pages/network/containers/LoadBalancers/StepCreateComponents/PoolStep/index.jsx index 5ac0199e..5bec1c1f 100644 --- a/src/pages/network/containers/LoadBalancers/StepCreateComponents/PoolStep/index.jsx +++ b/src/pages/network/containers/LoadBalancers/StepCreateComponents/PoolStep/index.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import Base from 'components/Form'; -import { Algorithm, algorithmTip } from 'resources/pool'; +import { Algorithm, algorithmTip } from 'resources/octavia/pool'; @inject('rootStore') @observer diff --git a/src/pages/network/containers/Network/Detail/index.jsx b/src/pages/network/containers/Network/Detail/index.jsx index 9d1c0c35..2f1cfb92 100644 --- a/src/pages/network/containers/Network/Detail/index.jsx +++ b/src/pages/network/containers/Network/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/TabDetail'; import { NetworkStore } from 'stores/neutron/network'; -import { networkStatus } from 'resources/network'; +import { networkStatus } from 'resources/neutron/network'; import VirtualAdapter from 'src/pages/network/containers/VirtualAdapter'; import globalRootStore from 'stores/root'; import Subnets from './Subnets'; diff --git a/src/pages/network/containers/Network/Network.jsx b/src/pages/network/containers/Network/Network.jsx index 40e5cba7..7de4e39a 100644 --- a/src/pages/network/containers/Network/Network.jsx +++ b/src/pages/network/containers/Network/Network.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { networkColumns } from 'resources/network'; +import { networkColumns } from 'resources/neutron/network'; import { NetworkStore } from 'stores/neutron/network'; import { yesNoOptions } from 'utils/constants'; import actionConfigs from './actions'; diff --git a/src/pages/network/containers/Network/actions/CreateNetwork.jsx b/src/pages/network/containers/Network/actions/CreateNetwork.jsx index e824bac4..19bddc5c 100644 --- a/src/pages/network/containers/Network/actions/CreateNetwork.jsx +++ b/src/pages/network/containers/Network/actions/CreateNetwork.jsx @@ -19,9 +19,9 @@ import globalNetworkStore from 'stores/neutron/network'; import globalProjectStore from 'stores/keystone/project'; import { isEmpty, isFunction } from 'lodash'; import Notify from 'components/Notify'; -import { checkPolicyRule } from 'resources/policy'; +import { checkPolicyRule } from 'resources/keystone/policy'; import globalNeutronStore from 'stores/neutron/neutron'; -import { subnetIpv6Tip } from 'resources/network'; +import { subnetIpv6Tip } from 'resources/neutron/network'; import networkUtil from './networkUtil'; const { diff --git a/src/pages/network/containers/Network/actions/CreateSubnet.jsx b/src/pages/network/containers/Network/actions/CreateSubnet.jsx index cee0ec91..14863858 100644 --- a/src/pages/network/containers/Network/actions/CreateSubnet.jsx +++ b/src/pages/network/containers/Network/actions/CreateSubnet.jsx @@ -17,10 +17,10 @@ import { ModalAction } from 'containers/Action'; import { ipValidate } from 'utils/validate'; import globalNetworkStore from 'stores/neutron/network'; import { isEmpty } from 'lodash'; -import { checkPolicyRule } from 'resources/policy'; +import { checkPolicyRule } from 'resources/keystone/policy'; import globalProjectStore from 'stores/keystone/project'; import globalRootStore from 'stores/root'; -import { subnetIpv6Tip } from 'resources/network'; +import { subnetIpv6Tip } from 'resources/neutron/network'; import networkUtil from './networkUtil'; const { diff --git a/src/pages/network/containers/Network/actions/Delete.jsx b/src/pages/network/containers/Network/actions/Delete.jsx index 9f039e50..5be6fe8a 100644 --- a/src/pages/network/containers/Network/actions/Delete.jsx +++ b/src/pages/network/containers/Network/actions/Delete.jsx @@ -14,7 +14,7 @@ import { ConfirmAction } from 'containers/Action'; import globalNetworkStore from 'stores/neutron/network'; -import { checkPolicyRule } from 'resources/policy'; +import { checkPolicyRule } from 'resources/keystone/policy'; import globalRootStore from 'stores/root'; export default class DeleteAction extends ConfirmAction { diff --git a/src/pages/network/containers/Network/actions/Edit.jsx b/src/pages/network/containers/Network/actions/Edit.jsx index ad9c0bb1..e4825a1c 100644 --- a/src/pages/network/containers/Network/actions/Edit.jsx +++ b/src/pages/network/containers/Network/actions/Edit.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalNetworkStore from 'stores/neutron/network'; -import { checkPolicyRule } from 'resources/policy'; +import { checkPolicyRule } from 'resources/keystone/policy'; import globalRootStore from 'stores/root'; import { getYesNoList } from 'utils/index'; diff --git a/src/pages/network/containers/QoSPolicy/QoSPolicy.js b/src/pages/network/containers/QoSPolicy/QoSPolicy.js index ace96728..b3529c6a 100644 --- a/src/pages/network/containers/QoSPolicy/QoSPolicy.js +++ b/src/pages/network/containers/QoSPolicy/QoSPolicy.js @@ -15,7 +15,10 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import { QoSPolicyStore } from 'stores/neutron/qos-policy'; -import { getQosPolicyColumns, getQosPolicyFilters } from 'resources/qos-policy'; +import { + getQosPolicyColumns, + getQosPolicyFilters, +} from 'resources/neutron/qos-policy'; import { qosEndpoint } from 'client/client/constants'; import { emptyActionConfig } from 'utils/constants'; import actionConfigs from './actions'; diff --git a/src/pages/network/containers/Router/Detail/index.jsx b/src/pages/network/containers/Router/Detail/index.jsx index 65d52bb6..4ee96020 100644 --- a/src/pages/network/containers/Router/Detail/index.jsx +++ b/src/pages/network/containers/Router/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { RouterStore } from 'stores/neutron/router'; import Base from 'containers/TabDetail'; -import { routerStatus, getRouterState } from 'resources/router'; +import { routerStatus, getRouterState } from 'resources/neutron/router'; import BaseDetail from './BaseDetail'; import Port from '../Port'; import StaticRouter from '../StaticRouter'; diff --git a/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx b/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx index 0f6d4850..19552c76 100644 --- a/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx +++ b/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import Base from 'containers/BaseDetail'; -import { bindingTypes } from 'resources/port'; +import { bindingTypes } from 'resources/neutron/port'; import { isEmpty } from 'lodash'; @inject('rootStore') diff --git a/src/pages/network/containers/Router/Port/Detail/index.jsx b/src/pages/network/containers/Router/Port/Detail/index.jsx index 9e9b3c52..db406b79 100644 --- a/src/pages/network/containers/Router/Port/Detail/index.jsx +++ b/src/pages/network/containers/Router/Port/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { PortStore } from 'stores/neutron/port'; import Base from 'containers/TabDetail'; -import { portStatus } from 'resources/port'; +import { portStatus } from 'resources/neutron/port'; import BaseDetail from './BaseDetail'; export class PortDetail extends Base { diff --git a/src/pages/network/containers/Router/Port/index.jsx b/src/pages/network/containers/Router/Port/index.jsx index 53b924ff..877a03f9 100644 --- a/src/pages/network/containers/Router/Port/index.jsx +++ b/src/pages/network/containers/Router/Port/index.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { portStatus } from 'resources/port'; +import { portStatus } from 'resources/neutron/port'; import { PortStore } from 'stores/neutron/port'; import { getOptions } from 'utils'; diff --git a/src/pages/network/containers/Router/actions/Create.jsx b/src/pages/network/containers/Router/actions/Create.jsx index 006aeb58..ee69c506 100644 --- a/src/pages/network/containers/Router/actions/Create.jsx +++ b/src/pages/network/containers/Router/actions/Create.jsx @@ -18,11 +18,11 @@ import { NetworkStore } from 'stores/neutron/network'; import globalNeutronStore from 'stores/neutron/neutron'; import { ModalAction } from 'containers/Action'; import { has } from 'lodash'; -import { networkStatus } from 'resources/network'; +import { networkStatus } from 'resources/neutron/network'; import { availabilityZoneState, availabilityZoneResource, -} from 'resources/neutron'; +} from 'resources/neutron/neutron'; export class Create extends ModalAction { static id = 'create'; diff --git a/src/pages/network/containers/Router/actions/SetGateway.jsx b/src/pages/network/containers/Router/actions/SetGateway.jsx index beded33c..cb781c7b 100644 --- a/src/pages/network/containers/Router/actions/SetGateway.jsx +++ b/src/pages/network/containers/Router/actions/SetGateway.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import globalRouterStore from 'stores/neutron/router'; import { NetworkStore } from 'stores/neutron/network'; import { ModalAction } from 'containers/Action'; -import { networkStatus, networkSortProps } from 'resources/network'; +import { networkStatus, networkSortProps } from 'resources/neutron/network'; export class SetGateway extends ModalAction { static id = 'set-gateway'; diff --git a/src/pages/network/containers/Router/index.jsx b/src/pages/network/containers/Router/index.jsx index 893150d2..f97d5d67 100644 --- a/src/pages/network/containers/Router/index.jsx +++ b/src/pages/network/containers/Router/index.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { getRouterColumns, routerFilters } from 'resources/router'; +import { getRouterColumns, routerFilters } from 'resources/neutron/router'; import globalRouterStore, { RouterStore } from 'stores/neutron/router'; import actionConfigs from './actions'; diff --git a/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Create.jsx b/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Create.jsx index ffbf8989..465e193f 100644 --- a/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Create.jsx +++ b/src/pages/network/containers/SecurityGroup/Detail/Rule/actions/Create.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalSecurityGroupRuleStore from 'stores/neutron/security-rule'; import globalSecurityGroupStore from 'stores/neutron/security-group'; -import { ipProtocols } from 'resources/security-group-rule'; +import { ipProtocols } from 'resources/neutron/security-group-rule'; import { has } from 'lodash'; import { cidrAllValidate } from 'utils/validate'; diff --git a/src/pages/network/containers/SecurityGroup/Detail/Rule/index.jsx b/src/pages/network/containers/SecurityGroup/Detail/Rule/index.jsx index af2c22a7..a26cc178 100644 --- a/src/pages/network/containers/SecurityGroup/Detail/Rule/index.jsx +++ b/src/pages/network/containers/SecurityGroup/Detail/Rule/index.jsx @@ -15,7 +15,10 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalSecurityGroupRuleStore from 'stores/neutron/security-rule'; -import { filterParams, getSelfColumns } from 'resources/security-group-rule'; +import { + filterParams, + getSelfColumns, +} from 'resources/neutron/security-group-rule'; import { getPath } from 'utils/route-map'; import actionConfigs from './actions'; diff --git a/src/pages/network/containers/Topology/InstanceCard.jsx b/src/pages/network/containers/Topology/InstanceCard.jsx index 6db3617b..5b6acf79 100644 --- a/src/pages/network/containers/Topology/InstanceCard.jsx +++ b/src/pages/network/containers/Topology/InstanceCard.jsx @@ -14,7 +14,7 @@ import React from 'react'; import { Popover, Avatar } from 'antd'; -import { instanceStatus } from 'resources/instance'; +import { instanceStatus } from 'resources/nova/instance'; import instanceImage from 'asset/image/instance.png'; import ImageType from 'components/ImageType'; import { Link } from 'react-router-dom'; diff --git a/src/pages/network/containers/Topology/NodeCard.jsx b/src/pages/network/containers/Topology/NodeCard.jsx index 35a6d90d..ab534bc6 100644 --- a/src/pages/network/containers/Topology/NodeCard.jsx +++ b/src/pages/network/containers/Topology/NodeCard.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { generateId } from 'utils/index'; import { getLocalTimeStr } from 'utils/time'; -import { routerStatus } from 'resources/router'; +import { routerStatus } from 'resources/neutron/router'; import { Descriptions, Popover, Button, Avatar } from 'antd'; import { Link } from 'react-router-dom'; import routerImage from 'asset/image/router.png'; diff --git a/src/pages/network/containers/Topology/index.jsx b/src/pages/network/containers/Topology/index.jsx index 13e14e03..afec8af6 100644 --- a/src/pages/network/containers/Topology/index.jsx +++ b/src/pages/network/containers/Topology/index.jsx @@ -28,11 +28,11 @@ import { combosBackground, combosColors, subnetsColors, -} from 'resources/topology-color'; +} from 'resources/neutron/topology-color'; import PrimaryActionButtons from 'components/Tables/Base/PrimaryActionButtons'; import { ipValidate } from 'utils/validate'; import { toJS } from 'mobx'; -import { getAnchorData, isExternalNetwork } from 'resources/network'; +import { getAnchorData, isExternalNetwork } from 'resources/neutron/network'; import styles from './index.less'; import CreateRouter from '../Router/actions/Create'; import CreateNetwork from '../Network/actions/CreateNetwork'; diff --git a/src/pages/network/containers/VPN/EndpointGroup/actions/Create.js b/src/pages/network/containers/VPN/EndpointGroup/actions/Create.js index eb3e9d55..1f2c3ce5 100644 --- a/src/pages/network/containers/VPN/EndpointGroup/actions/Create.js +++ b/src/pages/network/containers/VPN/EndpointGroup/actions/Create.js @@ -18,8 +18,11 @@ import { ipValidate } from 'utils/validate'; import { RouterStore } from 'stores/neutron/router'; import { SubnetStore } from 'stores/neutron/subnet'; import globalVPNEndPointGroupStore from 'stores/neutron/vpn-endpoint-group'; -import { getRouterSelectTablePropsBackend } from 'resources/router'; -import { getPortsWithFixedIPs, getSubnetToRouter } from 'resources/floatingip'; +import { getRouterSelectTablePropsBackend } from 'resources/neutron/router'; +import { + getPortsWithFixedIPs, + getSubnetToRouter, +} from 'resources/neutron/floatingip'; const { isCidr, isIPv6CidrOnly } = ipValidate; diff --git a/src/pages/network/containers/VPN/EndpointGroup/actions/Delete.jsx b/src/pages/network/containers/VPN/EndpointGroup/actions/Delete.jsx index f402497e..0b831c25 100644 --- a/src/pages/network/containers/VPN/EndpointGroup/actions/Delete.jsx +++ b/src/pages/network/containers/VPN/EndpointGroup/actions/Delete.jsx @@ -13,7 +13,7 @@ // limitations under the License. import { ConfirmAction } from 'containers/Action'; -import { checkPolicyRule } from 'resources/policy'; +import { checkPolicyRule } from 'resources/keystone/policy'; import globalVPNEndPointGroupStore from 'stores/neutron/vpn-endpoint-group'; import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection'; import globalRootStore from 'stores/root'; diff --git a/src/pages/network/containers/VPN/IKEPolicy/actions/Create.js b/src/pages/network/containers/VPN/IKEPolicy/actions/Create.js index bce9eece..fef353d2 100644 --- a/src/pages/network/containers/VPN/IKEPolicy/actions/Create.js +++ b/src/pages/network/containers/VPN/IKEPolicy/actions/Create.js @@ -20,7 +20,7 @@ import { encryptionAlgorithmOptions, ikePolicyIKEVersionOptions, pfsOptions, -} from 'resources/vpn'; +} from 'resources/neutron/vpn'; @inject('rootStore') @observer diff --git a/src/pages/network/containers/VPN/IKEPolicy/actions/Delete.jsx b/src/pages/network/containers/VPN/IKEPolicy/actions/Delete.jsx index 39698d06..ea8aeafb 100644 --- a/src/pages/network/containers/VPN/IKEPolicy/actions/Delete.jsx +++ b/src/pages/network/containers/VPN/IKEPolicy/actions/Delete.jsx @@ -13,7 +13,7 @@ // limitations under the License. import { ConfirmAction } from 'containers/Action'; -import { checkPolicyRule } from 'resources/policy'; +import { checkPolicyRule } from 'resources/keystone/policy'; import globalVpnIKEPolicyStore from 'stores/neutron/vpn-ike-policy'; import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection'; import globalRootStore from 'stores/root'; diff --git a/src/pages/network/containers/VPN/IKEPolicy/index.jsx b/src/pages/network/containers/VPN/IKEPolicy/index.jsx index 06c7c68d..5f15c7e5 100644 --- a/src/pages/network/containers/VPN/IKEPolicy/index.jsx +++ b/src/pages/network/containers/VPN/IKEPolicy/index.jsx @@ -21,7 +21,7 @@ import { encryptionAlgorithmOptions, ikePolicyIKEVersionOptions, pfsOptions, -} from 'resources/vpn'; +} from 'resources/neutron/vpn'; import { actionConfigs, adminConfigs } from './actions'; @inject('rootStore') diff --git a/src/pages/network/containers/VPN/IPsecPolicy/actions/Create.js b/src/pages/network/containers/VPN/IPsecPolicy/actions/Create.js index f5799ad9..c57ce15b 100644 --- a/src/pages/network/containers/VPN/IPsecPolicy/actions/Create.js +++ b/src/pages/network/containers/VPN/IPsecPolicy/actions/Create.js @@ -21,7 +21,7 @@ import { ipsecPolicyEncapsulationModeOptions, ipsecPolicyTransformProtocolOptions, pfsOptions, -} from 'resources/vpn'; +} from 'resources/neutron/vpn'; @inject('rootStore') @observer diff --git a/src/pages/network/containers/VPN/IPsecPolicy/actions/Delete.jsx b/src/pages/network/containers/VPN/IPsecPolicy/actions/Delete.jsx index 880c7c73..3c28be2f 100644 --- a/src/pages/network/containers/VPN/IPsecPolicy/actions/Delete.jsx +++ b/src/pages/network/containers/VPN/IPsecPolicy/actions/Delete.jsx @@ -13,7 +13,7 @@ // limitations under the License. import { ConfirmAction } from 'containers/Action'; -import { checkPolicyRule } from 'resources/policy'; +import { checkPolicyRule } from 'resources/keystone/policy'; import globalVpnIPsecPolicyStore from 'stores/neutron/vpn-ipsec-policy'; import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection'; import globalRootStore from 'stores/root'; diff --git a/src/pages/network/containers/VPN/IPsecPolicy/index.jsx b/src/pages/network/containers/VPN/IPsecPolicy/index.jsx index 75c79f0d..5a8a7d9a 100644 --- a/src/pages/network/containers/VPN/IPsecPolicy/index.jsx +++ b/src/pages/network/containers/VPN/IPsecPolicy/index.jsx @@ -22,7 +22,7 @@ import { ipsecPolicyEncapsulationModeOptions, ipsecPolicyTransformProtocolOptions, pfsOptions, -} from 'resources/vpn'; +} from 'resources/neutron/vpn'; import { actionConfigs, adminConfigs } from './actions'; @inject('rootStore') diff --git a/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Delete.jsx b/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Delete.jsx index 3a7b3fa9..be008755 100644 --- a/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Delete.jsx +++ b/src/pages/network/containers/VPN/IPsecSiteConnection/actions/Delete.jsx @@ -13,7 +13,7 @@ // limitations under the License. import { ConfirmAction } from 'containers/Action'; -import { checkPolicyRule } from 'resources/policy'; +import { checkPolicyRule } from 'resources/keystone/policy'; import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection'; import globalRootStore from 'stores/root'; diff --git a/src/pages/network/containers/VPN/IPsecSiteConnection/index.jsx b/src/pages/network/containers/VPN/IPsecSiteConnection/index.jsx index 31bac8a1..ba6206ca 100644 --- a/src/pages/network/containers/VPN/IPsecSiteConnection/index.jsx +++ b/src/pages/network/containers/VPN/IPsecSiteConnection/index.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import { VpnIPsecConnectionStore } from 'stores/neutron/vpn-ipsec-connection'; -import { vpnStatus, vpnStatusOptions } from 'resources/vpn'; +import { vpnStatus, vpnStatusOptions } from 'resources/neutron/vpn'; import { actionConfigs, adminConfigs } from './actions'; @inject('rootStore') diff --git a/src/pages/network/containers/VPN/VPNGateway/actions/Create.js b/src/pages/network/containers/VPN/VPNGateway/actions/Create.js index 3b2d4027..2c7b3ba4 100644 --- a/src/pages/network/containers/VPN/VPNGateway/actions/Create.js +++ b/src/pages/network/containers/VPN/VPNGateway/actions/Create.js @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import { RouterStore } from 'stores/neutron/router'; import globalVpnServicesStore from 'stores/neutron/vpn-service'; -import { getRouterSelectTablePropsBackend } from 'resources/router'; +import { getRouterSelectTablePropsBackend } from 'resources/neutron/router'; @inject('rootStore') @observer diff --git a/src/pages/network/containers/VPN/VPNGateway/actions/Delete.jsx b/src/pages/network/containers/VPN/VPNGateway/actions/Delete.jsx index 209b912e..b776862b 100644 --- a/src/pages/network/containers/VPN/VPNGateway/actions/Delete.jsx +++ b/src/pages/network/containers/VPN/VPNGateway/actions/Delete.jsx @@ -13,7 +13,7 @@ // limitations under the License. import { ConfirmAction } from 'containers/Action'; -import { checkPolicyRule } from 'resources/policy'; +import { checkPolicyRule } from 'resources/keystone/policy'; import globalVpnServicesStore from 'stores/neutron/vpn-service'; import globalRootStore from 'stores/root'; import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection'; diff --git a/src/pages/network/containers/VPN/VPNGateway/index.jsx b/src/pages/network/containers/VPN/VPNGateway/index.jsx index 6c06bb2f..692de8de 100644 --- a/src/pages/network/containers/VPN/VPNGateway/index.jsx +++ b/src/pages/network/containers/VPN/VPNGateway/index.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import { VpnServicesStore } from 'stores/neutron/vpn-service'; -import { vpnStatus, vpnStatusOptions } from 'resources/vpn'; +import { vpnStatus, vpnStatusOptions } from 'resources/neutron/vpn'; import React from 'react'; import { actionConfigs, adminConfigs } from './actions'; diff --git a/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx b/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx index 21efe3ab..37f96e43 100644 --- a/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx +++ b/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx @@ -16,7 +16,7 @@ import React from 'react'; import { Link } from 'react-router-dom'; import { inject, observer } from 'mobx-react'; import Base from 'containers/BaseDetail'; -import { bindingTypes } from 'resources/port'; +import { bindingTypes } from 'resources/neutron/port'; import { qosEndpoint } from 'client/client/constants'; @inject('rootStore') diff --git a/src/pages/network/containers/VirtualAdapter/Detail/SecurityGroups/index.jsx b/src/pages/network/containers/VirtualAdapter/Detail/SecurityGroups/index.jsx index 7685a013..8664f3e9 100644 --- a/src/pages/network/containers/VirtualAdapter/Detail/SecurityGroups/index.jsx +++ b/src/pages/network/containers/VirtualAdapter/Detail/SecurityGroups/index.jsx @@ -23,7 +23,7 @@ import { toJS } from 'mobx'; import { CaretRightOutlined } from '@ant-design/icons'; import PrimaryActionButtons from 'components/Tables/Base/PrimaryActionButtons'; import ItemActionButtons from 'components/Tables/Base/ItemActionButtons'; -import { getSelfColumns } from 'resources/security-group-rule'; +import { getSelfColumns } from 'resources/neutron/security-group-rule'; import { isAdminPage } from 'utils/index'; import { getPath } from 'utils/route-map'; import Detach from './actions/Detach'; diff --git a/src/pages/network/containers/VirtualAdapter/Detail/index.jsx b/src/pages/network/containers/VirtualAdapter/Detail/index.jsx index 65095d88..c6bd224b 100644 --- a/src/pages/network/containers/VirtualAdapter/Detail/index.jsx +++ b/src/pages/network/containers/VirtualAdapter/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { VirtualAdapterStore } from 'stores/neutron/virtual-adapter'; import Base from 'containers/TabDetail'; -import { networkStatus } from 'resources/network'; +import { networkStatus } from 'resources/neutron/network'; import FixedIPs from './FixedIPs'; import SecurityGroups from './SecurityGroups'; import AllowedAddressPair from './AllowedAddressPair'; diff --git a/src/pages/network/containers/VirtualAdapter/actions/AssociateFIP.jsx b/src/pages/network/containers/VirtualAdapter/actions/AssociateFIP.jsx index 429018d7..6774cb1e 100644 --- a/src/pages/network/containers/VirtualAdapter/actions/AssociateFIP.jsx +++ b/src/pages/network/containers/VirtualAdapter/actions/AssociateFIP.jsx @@ -15,13 +15,13 @@ import { inject, observer } from 'mobx-react'; import globalFloatingIpsStore from 'stores/neutron/floatingIp'; import { ModalAction } from 'containers/Action'; -import { isNotError } from 'resources/instance'; -import { getPortsAndReasons } from 'resources/port'; -import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/router'; +import { isNotError } from 'resources/nova/instance'; +import { getPortsAndReasons } from 'resources/neutron/port'; +import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/neutron/router'; import { getInterfaceWithReason, handleFixedIPChange, -} from 'resources/floatingip'; +} from 'resources/neutron/floatingip'; @inject('rootStore') @observer diff --git a/src/pages/network/containers/VirtualAdapter/actions/Attach.jsx b/src/pages/network/containers/VirtualAdapter/actions/Attach.jsx index 62c7ff7a..74edcd6a 100644 --- a/src/pages/network/containers/VirtualAdapter/actions/Attach.jsx +++ b/src/pages/network/containers/VirtualAdapter/actions/Attach.jsx @@ -18,7 +18,7 @@ import globalServerStore, { ServerStore } from 'stores/nova/instance'; import { instanceSelectTablePropsBackend, allowAttachInterfaceStatus, -} from 'resources/instance'; +} from 'resources/nova/instance'; export class Attach extends ModalAction { static id = 'attach_instance'; diff --git a/src/pages/network/containers/VirtualAdapter/actions/Create.jsx b/src/pages/network/containers/VirtualAdapter/actions/Create.jsx index 9b39bb5d..610f0986 100644 --- a/src/pages/network/containers/VirtualAdapter/actions/Create.jsx +++ b/src/pages/network/containers/VirtualAdapter/actions/Create.jsx @@ -23,7 +23,7 @@ import { QoSPolicyStore } from 'stores/neutron/qos-policy'; import globalVirtualAdapterStore from 'stores/neutron/virtual-adapter'; import globalProjectStore from 'stores/keystone/project'; import { SubnetStore } from 'stores/neutron/subnet'; -import { getQoSPolicyTabs } from 'resources/qos-policy'; +import { getQoSPolicyTabs } from 'resources/neutron/qos-policy'; import { qosEndpoint } from 'client/client/constants'; const portTypes = diff --git a/src/pages/network/containers/VirtualAdapter/actions/DisAssociateFIP.jsx b/src/pages/network/containers/VirtualAdapter/actions/DisAssociateFIP.jsx index b884280d..615855a5 100644 --- a/src/pages/network/containers/VirtualAdapter/actions/DisAssociateFIP.jsx +++ b/src/pages/network/containers/VirtualAdapter/actions/DisAssociateFIP.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import globalFloatingIpsStore from 'stores/neutron/floatingIp'; import { ModalAction } from 'containers/Action'; -import { isNotError } from 'resources/instance'; +import { isNotError } from 'resources/nova/instance'; @inject('rootStore') @observer diff --git a/src/pages/network/containers/VirtualAdapter/actions/ManageSecurityGroup.jsx b/src/pages/network/containers/VirtualAdapter/actions/ManageSecurityGroup.jsx index 3c1046d1..bc903286 100644 --- a/src/pages/network/containers/VirtualAdapter/actions/ManageSecurityGroup.jsx +++ b/src/pages/network/containers/VirtualAdapter/actions/ManageSecurityGroup.jsx @@ -19,7 +19,7 @@ import { SecurityGroupStore } from 'stores/neutron/security-group'; import { securityGroupColumns, securityGroupFilter, -} from 'resources/security-group'; +} from 'resources/neutron/security-group'; import { toJS } from 'mobx'; import { get as _get } from 'lodash'; diff --git a/src/pages/network/containers/VirtualAdapter/actions/ModifyQoS.jsx b/src/pages/network/containers/VirtualAdapter/actions/ModifyQoS.jsx index e8bd1f0b..f7935b3f 100644 --- a/src/pages/network/containers/VirtualAdapter/actions/ModifyQoS.jsx +++ b/src/pages/network/containers/VirtualAdapter/actions/ModifyQoS.jsx @@ -17,7 +17,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import { QoSPolicyStore } from 'stores/neutron/qos-policy'; import globalVirtualAdapterStore from 'stores/neutron/virtual-adapter'; -import { getQoSPolicyTabs } from 'resources/qos-policy'; +import { getQoSPolicyTabs } from 'resources/neutron/qos-policy'; import { qosEndpoint } from 'client/client/constants'; export class ModifyQoS extends ModalAction { diff --git a/src/pages/network/containers/VirtualAdapter/index.jsx b/src/pages/network/containers/VirtualAdapter/index.jsx index 1c7a656d..c7099b80 100644 --- a/src/pages/network/containers/VirtualAdapter/index.jsx +++ b/src/pages/network/containers/VirtualAdapter/index.jsx @@ -16,7 +16,7 @@ import React from 'react'; import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import { VirtualAdapterStore } from 'stores/neutron/virtual-adapter'; -import { portStatus } from 'resources/port'; +import { portStatus } from 'resources/neutron/port'; import { emptyActionConfig } from 'utils/constants'; import actionConfigs from './actions'; diff --git a/src/pages/share/containers/Share/actions/Create.jsx b/src/pages/share/containers/Share/actions/Create.jsx index b1907012..ebe22a80 100644 --- a/src/pages/share/containers/Share/actions/Create.jsx +++ b/src/pages/share/containers/Share/actions/Create.jsx @@ -22,18 +22,18 @@ import { ShareTypeStore } from 'stores/manila/share-type'; import { getShareGroupColumns, shareGroupFilters, -} from 'src/resources/manila/share-group'; +} from 'resources/manila/share-group'; import { shareTypeColumns, shareTypeFilters, checkShareTypeSupportServer, shareTypeTip, -} from 'src/resources/manila/share-type'; +} from 'resources/manila/share-type'; import { getShareNetworkColumns, shareNetworkFilters, -} from 'src/resources/manila/share-network'; -import { shareProtocol } from 'src/resources/manila/share'; +} from 'resources/manila/share-network'; +import { shareProtocol } from 'resources/manila/share'; import { cloneDeep } from 'lodash'; import { idNameColumn } from 'utils/table'; import { extraFormItem } from 'pages/share/containers/ShareType/actions/Create'; diff --git a/src/pages/share/containers/ShareGroup/actions/Create.jsx b/src/pages/share/containers/ShareGroup/actions/Create.jsx index c2316406..76327c6f 100644 --- a/src/pages/share/containers/ShareGroup/actions/Create.jsx +++ b/src/pages/share/containers/ShareGroup/actions/Create.jsx @@ -21,17 +21,17 @@ import { ShareStore } from 'stores/manila/share'; import { shareGroupTypeColumns, shareGroupTypeFilters, -} from 'src/resources/manila/share-group-type'; +} from 'resources/manila/share-group-type'; import { shareTypeColumns, shareTypeFilters, checkShareTypeSupportServer, shareTypeTip, -} from 'src/resources/manila/share-type'; +} from 'resources/manila/share-type'; import { getShareNetworkColumns, shareNetworkFilters, -} from 'src/resources/manila/share-network'; +} from 'resources/manila/share-network'; import { cloneDeep } from 'lodash'; import { idNameColumn } from 'utils/table'; diff --git a/src/pages/share/containers/ShareGroupType/actions/Create.jsx b/src/pages/share/containers/ShareGroupType/actions/Create.jsx index aa35f25b..b8c53316 100644 --- a/src/pages/share/containers/ShareGroupType/actions/Create.jsx +++ b/src/pages/share/containers/ShareGroupType/actions/Create.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalShareGroupTypeStore from 'stores/manila/share-group-type'; import globalShareTypeStore from 'stores/manila/share-type'; -import { projectTableOptions } from 'resources/project'; +import { projectTableOptions } from 'resources/keystone/project'; import { ProjectStore } from 'stores/keystone/project'; import { updateAddSelectValueToObj } from 'utils/index'; import { extraFormItem } from 'pages/share/containers/ShareType/actions/Create'; diff --git a/src/pages/share/containers/ShareGroupType/actions/ManageAccess.jsx b/src/pages/share/containers/ShareGroupType/actions/ManageAccess.jsx index 57616cf2..ac9a35b3 100644 --- a/src/pages/share/containers/ShareGroupType/actions/ManageAccess.jsx +++ b/src/pages/share/containers/ShareGroupType/actions/ManageAccess.jsx @@ -18,7 +18,7 @@ import globalShareGroupTypeStore, { } from 'stores/manila/share-group-type'; import { ModalAction } from 'containers/Action'; import { ProjectStore } from 'stores/keystone/project'; -import { projectTableOptions } from 'resources/project'; +import { projectTableOptions } from 'resources/keystone/project'; export class ManageAccess extends ModalAction { static id = 'manage-access'; diff --git a/src/pages/share/containers/ShareGroupType/index.jsx b/src/pages/share/containers/ShareGroupType/index.jsx index 326ce18e..ff0dec33 100644 --- a/src/pages/share/containers/ShareGroupType/index.jsx +++ b/src/pages/share/containers/ShareGroupType/index.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalShareGroupTypeStore from 'stores/manila/share-group-type'; -import { shareGroupTypeColumns } from 'src/resources/manila/share-group-type'; +import { shareGroupTypeColumns } from 'resources/manila/share-group-type'; import actionConfigs from './actions'; export class ShareGroupType extends Base { diff --git a/src/pages/share/containers/ShareType/actions/Create.jsx b/src/pages/share/containers/ShareType/actions/Create.jsx index 6baf2ea0..bafdfec0 100644 --- a/src/pages/share/containers/ShareType/actions/Create.jsx +++ b/src/pages/share/containers/ShareType/actions/Create.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalShareTypeStore from 'stores/manila/share-type'; -import { projectTableOptions } from 'resources/project'; +import { projectTableOptions } from 'resources/keystone/project'; import { ProjectStore } from 'stores/keystone/project'; import KeyValueInput from 'components/FormItem/KeyValueInput'; import { isEmpty } from 'lodash'; diff --git a/src/pages/share/containers/ShareType/actions/ManageAccess.jsx b/src/pages/share/containers/ShareType/actions/ManageAccess.jsx index ca0c640d..0d90be38 100644 --- a/src/pages/share/containers/ShareType/actions/ManageAccess.jsx +++ b/src/pages/share/containers/ShareType/actions/ManageAccess.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import globalShareTypeStore, { ShareTypeStore } from 'stores/manila/share-type'; import { ModalAction } from 'containers/Action'; import { ProjectStore } from 'stores/keystone/project'; -import { projectTableOptions } from 'resources/project'; +import { projectTableOptions } from 'resources/keystone/project'; export class ManageAccess extends ModalAction { static id = 'manage-access'; diff --git a/src/pages/storage/containers/Backup/Detail/index.jsx b/src/pages/storage/containers/Backup/Detail/index.jsx index f68d72a7..e5229f71 100644 --- a/src/pages/storage/containers/Backup/Detail/index.jsx +++ b/src/pages/storage/containers/Backup/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import globalBackupStore from 'stores/cinder/backup'; import Base from 'containers/TabDetail'; -import { backupStatus } from 'resources/backup'; +import { backupStatus } from 'resources/cinder/backup'; import BaseDetail from './BaseDetail'; import actionConfigs from '../actions'; diff --git a/src/pages/storage/containers/Backup/actions/Create.jsx b/src/pages/storage/containers/Backup/actions/Create.jsx index 150a628c..a19da434 100644 --- a/src/pages/storage/containers/Backup/actions/Create.jsx +++ b/src/pages/storage/containers/Backup/actions/Create.jsx @@ -16,12 +16,12 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalVolumeStore from 'stores/cinder/volume'; import globalBackupStore from 'stores/cinder/backup'; -import { createTip, backupModeList, modeTip } from 'resources/backup'; +import { createTip, backupModeList, modeTip } from 'resources/cinder/backup'; import { isAvailableOrInUse, isInUse, volumeSelectTablePropsBackend, -} from 'resources/volume'; +} from 'resources/cinder/volume'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Backup/actions/Restore.jsx b/src/pages/storage/containers/Backup/actions/Restore.jsx index f811b027..af05d963 100644 --- a/src/pages/storage/containers/Backup/actions/Restore.jsx +++ b/src/pages/storage/containers/Backup/actions/Restore.jsx @@ -17,9 +17,9 @@ import globalBackupStore from 'stores/cinder/backup'; import { VolumeStore } from 'stores/cinder/volume'; import { ServerGroupInstanceStore } from 'stores/skyline/server-group-instance'; import { inject, observer } from 'mobx-react'; -import { restoreTip } from 'resources/backup'; -import { volumeStatus } from 'resources/volume'; -import { instanceStatus, isShutOff } from 'resources/instance'; +import { restoreTip } from 'resources/cinder/backup'; +import { volumeStatus } from 'resources/cinder/volume'; +import { instanceStatus, isShutOff } from 'resources/nova/instance'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Backup/index.jsx b/src/pages/storage/containers/Backup/index.jsx index 1943b1ed..a264832c 100644 --- a/src/pages/storage/containers/Backup/index.jsx +++ b/src/pages/storage/containers/Backup/index.jsx @@ -16,7 +16,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalBackupStore, { BackupStore } from 'stores/cinder/backup'; import CreateBackup from 'pages/storage/containers/Volume/actions/CreateBackup'; -import { backupStatus } from 'resources/backup'; +import { backupStatus } from 'resources/cinder/backup'; import actionConfigs from './actions'; @inject('rootStore') diff --git a/src/pages/storage/containers/Container/Detail/actions/CopyFile.jsx b/src/pages/storage/containers/Container/Detail/actions/CopyFile.jsx index 247a6288..14fb4ee8 100644 --- a/src/pages/storage/containers/Container/Detail/actions/CopyFile.jsx +++ b/src/pages/storage/containers/Container/Detail/actions/CopyFile.jsx @@ -14,8 +14,8 @@ import { ConfirmAction } from 'containers/Action'; import globalObjectStore from 'stores/swift/object'; -import { allCanChangePolicy } from 'resources/policy'; -import { isFile } from 'resources/container'; +import { allCanChangePolicy } from 'resources/keystone/policy'; +import { isFile } from 'resources/swift/container'; export default class CopyFile extends ConfirmAction { get id() { diff --git a/src/pages/storage/containers/Container/Detail/actions/CreateFolder.jsx b/src/pages/storage/containers/Container/Detail/actions/CreateFolder.jsx index 5111f087..dbb2cceb 100644 --- a/src/pages/storage/containers/Container/Detail/actions/CreateFolder.jsx +++ b/src/pages/storage/containers/Container/Detail/actions/CreateFolder.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalObjectStore from 'stores/swift/object'; -import { allCanChangePolicy } from 'resources/policy'; +import { allCanChangePolicy } from 'resources/keystone/policy'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Container/Detail/actions/CutFile.jsx b/src/pages/storage/containers/Container/Detail/actions/CutFile.jsx index 7d2442fe..aaf92ac6 100644 --- a/src/pages/storage/containers/Container/Detail/actions/CutFile.jsx +++ b/src/pages/storage/containers/Container/Detail/actions/CutFile.jsx @@ -14,8 +14,8 @@ import { ConfirmAction } from 'containers/Action'; import globalObjectStore from 'stores/swift/object'; -import { allCanChangePolicy } from 'resources/policy'; -import { isFile } from 'resources/container'; +import { allCanChangePolicy } from 'resources/keystone/policy'; +import { isFile } from 'resources/swift/container'; export default class CutFile extends ConfirmAction { get id() { diff --git a/src/pages/storage/containers/Container/Detail/actions/Delete.jsx b/src/pages/storage/containers/Container/Detail/actions/Delete.jsx index 18b7cc47..219528c2 100644 --- a/src/pages/storage/containers/Container/Detail/actions/Delete.jsx +++ b/src/pages/storage/containers/Container/Detail/actions/Delete.jsx @@ -14,8 +14,8 @@ import { ConfirmAction } from 'containers/Action'; import globalObjectStore, { ObjectStore } from 'stores/swift/object'; -import { allCanChangePolicy } from 'resources/policy'; -import { isFile } from 'resources/container'; +import { allCanChangePolicy } from 'resources/keystone/policy'; +import { isFile } from 'resources/swift/container'; export default class Delete extends ConfirmAction { get id() { diff --git a/src/pages/storage/containers/Container/Detail/actions/Download.jsx b/src/pages/storage/containers/Container/Detail/actions/Download.jsx index 9595b516..73616362 100644 --- a/src/pages/storage/containers/Container/Detail/actions/Download.jsx +++ b/src/pages/storage/containers/Container/Detail/actions/Download.jsx @@ -13,9 +13,9 @@ // limitations under the License. import { ConfirmAction } from 'containers/Action'; -import { isFile } from 'resources/container'; +import { isFile } from 'resources/swift/container'; import globalObjectStore from 'stores/swift/object'; -import { allCanChangePolicy } from 'resources/policy'; +import { allCanChangePolicy } from 'resources/keystone/policy'; import FileSaver from 'file-saver'; export default class Download extends ConfirmAction { diff --git a/src/pages/storage/containers/Container/Detail/actions/Edit.jsx b/src/pages/storage/containers/Container/Detail/actions/Edit.jsx index 6a83b6da..282d24a5 100644 --- a/src/pages/storage/containers/Container/Detail/actions/Edit.jsx +++ b/src/pages/storage/containers/Container/Detail/actions/Edit.jsx @@ -15,8 +15,8 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalObjectStore, { ObjectStore } from 'stores/swift/object'; -import { allCanChangePolicy } from 'resources/policy'; -import { isFile } from 'resources/container'; +import { allCanChangePolicy } from 'resources/keystone/policy'; +import { isFile } from 'resources/swift/container'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Container/Detail/actions/PasteFile.jsx b/src/pages/storage/containers/Container/Detail/actions/PasteFile.jsx index df894aef..1ec92bff 100644 --- a/src/pages/storage/containers/Container/Detail/actions/PasteFile.jsx +++ b/src/pages/storage/containers/Container/Detail/actions/PasteFile.jsx @@ -15,8 +15,8 @@ import React from 'react'; import { ConfirmAction } from 'containers/Action'; import globalObjectStore from 'stores/swift/object'; -import { allCanChangePolicy } from 'resources/policy'; -import { isFolder } from 'resources/container'; +import { allCanChangePolicy } from 'resources/keystone/policy'; +import { isFolder } from 'resources/swift/container'; export default class PasteFile extends ConfirmAction { get id() { diff --git a/src/pages/storage/containers/Container/Detail/actions/Rename.jsx b/src/pages/storage/containers/Container/Detail/actions/Rename.jsx index fb73bbe4..bda7b89a 100644 --- a/src/pages/storage/containers/Container/Detail/actions/Rename.jsx +++ b/src/pages/storage/containers/Container/Detail/actions/Rename.jsx @@ -15,8 +15,8 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalObjectStore from 'stores/swift/object'; -import { allCanChangePolicy } from 'resources/policy'; -import { isFile } from 'resources/container'; +import { allCanChangePolicy } from 'resources/keystone/policy'; +import { isFile } from 'resources/swift/container'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Container/Detail/actions/UploadFile.jsx b/src/pages/storage/containers/Container/Detail/actions/UploadFile.jsx index eb10c979..c6300eac 100644 --- a/src/pages/storage/containers/Container/Detail/actions/UploadFile.jsx +++ b/src/pages/storage/containers/Container/Detail/actions/UploadFile.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalObjectStore, { ObjectStore } from 'stores/swift/object'; -import { allCanChangePolicy } from 'resources/policy'; +import { allCanChangePolicy } from 'resources/keystone/policy'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Container/Detail/index.jsx b/src/pages/storage/containers/Container/Detail/index.jsx index 32a6127a..ecc699aa 100644 --- a/src/pages/storage/containers/Container/Detail/index.jsx +++ b/src/pages/storage/containers/Container/Detail/index.jsx @@ -18,10 +18,10 @@ import { Popover, Col, Row, Skeleton } from 'antd'; import Base from 'containers/List'; import globalObjectStore, { ObjectStore } from 'stores/swift/object'; import { bytesFilter } from 'utils/index'; -import { allCanReadPolicy } from 'resources/policy'; +import { allCanReadPolicy } from 'resources/keystone/policy'; import { toJS } from 'mobx'; import { isEqual } from 'lodash'; -import { isFolder } from 'resources/container'; +import { isFolder } from 'resources/swift/container'; import { getStrFromTimestamp } from 'utils/time'; import styles from './index.less'; import actionConfigs from './actions'; diff --git a/src/pages/storage/containers/Container/actions/Access.jsx b/src/pages/storage/containers/Container/actions/Access.jsx index a6717e1e..84b0d7a1 100644 --- a/src/pages/storage/containers/Container/actions/Access.jsx +++ b/src/pages/storage/containers/Container/actions/Access.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalContainerStore, { ContainerStore } from 'stores/swift/container'; -import { allCanChangePolicy } from 'resources/policy'; +import { allCanChangePolicy } from 'resources/keystone/policy'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Container/actions/Create.jsx b/src/pages/storage/containers/Container/actions/Create.jsx index a2e90a77..810ba020 100644 --- a/src/pages/storage/containers/Container/actions/Create.jsx +++ b/src/pages/storage/containers/Container/actions/Create.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalContainerStore from 'stores/swift/container'; -import { allCanChangePolicy } from 'resources/policy'; +import { allCanChangePolicy } from 'resources/keystone/policy'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Container/actions/Delete.jsx b/src/pages/storage/containers/Container/actions/Delete.jsx index 18cc9e30..cacd92a6 100644 --- a/src/pages/storage/containers/Container/actions/Delete.jsx +++ b/src/pages/storage/containers/Container/actions/Delete.jsx @@ -14,7 +14,7 @@ import { ConfirmAction } from 'containers/Action'; import globalContainerStore from 'stores/swift/container'; -import { allCanChangePolicy } from 'resources/policy'; +import { allCanChangePolicy } from 'resources/keystone/policy'; export default class Delete extends ConfirmAction { get id() { diff --git a/src/pages/storage/containers/Container/index.jsx b/src/pages/storage/containers/Container/index.jsx index b1c29d43..50159d33 100644 --- a/src/pages/storage/containers/Container/index.jsx +++ b/src/pages/storage/containers/Container/index.jsx @@ -18,7 +18,7 @@ import { Popover, Col, Row, Skeleton } from 'antd'; import Base from 'containers/List'; import globalContainerStore, { ContainerStore } from 'stores/swift/container'; import { bytesFilter } from 'utils/index'; -import { allCanChangePolicy } from 'resources/policy'; +import { allCanChangePolicy } from 'resources/keystone/policy'; import { getStrFromTimestamp } from 'utils/time'; import { swiftEndpoint } from 'client/client/constants'; import actionConfigs from './actions'; diff --git a/src/pages/storage/containers/Snapshot/Detail/index.jsx b/src/pages/storage/containers/Snapshot/Detail/index.jsx index 1840513e..bcfc543c 100644 --- a/src/pages/storage/containers/Snapshot/Detail/index.jsx +++ b/src/pages/storage/containers/Snapshot/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { SnapshotStore } from 'stores/cinder/snapshot'; import Base from 'containers/TabDetail'; -import { volumeStatus } from 'resources/volume'; +import { volumeStatus } from 'resources/cinder/volume'; import BaseDetail from './BaseDetail'; import actionConfigs from '../actions'; diff --git a/src/pages/storage/containers/Snapshot/index.jsx b/src/pages/storage/containers/Snapshot/index.jsx index 69d7fbbc..e4c3a380 100644 --- a/src/pages/storage/containers/Snapshot/index.jsx +++ b/src/pages/storage/containers/Snapshot/index.jsx @@ -14,7 +14,10 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { volumeStatus, snapshotTransitionStatuses } from 'resources/volume'; +import { + volumeStatus, + snapshotTransitionStatuses, +} from 'resources/cinder/volume'; import globalSnapshotStore, { SnapshotStore } from 'stores/cinder/snapshot'; import actionConfigs from './actions'; diff --git a/src/pages/storage/containers/Storage/index.jsx b/src/pages/storage/containers/Storage/index.jsx index 226a8721..b2c0f74c 100644 --- a/src/pages/storage/containers/Storage/index.jsx +++ b/src/pages/storage/containers/Storage/index.jsx @@ -15,7 +15,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalPoolStore from 'stores/cinder/pool'; -import { poolColumns } from 'resources/cinder-pool'; +import { poolColumns } from 'resources/cinder/cinder-pool'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Volume/Detail/index.jsx b/src/pages/storage/containers/Volume/Detail/index.jsx index c08e0a46..9736f971 100644 --- a/src/pages/storage/containers/Volume/Detail/index.jsx +++ b/src/pages/storage/containers/Volume/Detail/index.jsx @@ -17,7 +17,7 @@ import { VolumeStore } from 'stores/cinder/volume'; import Base from 'containers/TabDetail'; import Backup from 'pages/storage/containers/Backup'; import Snapshot from 'pages/storage/containers/Snapshot'; -import { volumeStatus } from 'resources/volume'; +import { volumeStatus } from 'resources/cinder/volume'; import BaseDetail from './BaseDetail'; import actionConfigs from '../actions'; diff --git a/src/pages/storage/containers/Volume/actions/Attach.jsx b/src/pages/storage/containers/Volume/actions/Attach.jsx index 850e8486..c2db87d4 100644 --- a/src/pages/storage/containers/Volume/actions/Attach.jsx +++ b/src/pages/storage/containers/Volume/actions/Attach.jsx @@ -19,8 +19,8 @@ import globalVolumeStore from 'stores/cinder/volume'; import { allowAttachVolumeInstance, instanceSelectTablePropsBackend, -} from 'resources/instance'; -import { isAvailable, isMultiAttach } from 'resources/volume'; +} from 'resources/nova/instance'; +import { isAvailable, isMultiAttach } from 'resources/cinder/volume'; export class Attach extends ModalAction { static id = 'attach'; diff --git a/src/pages/storage/containers/Volume/actions/ChangeType.jsx b/src/pages/storage/containers/Volume/actions/ChangeType.jsx index 772caaf5..c8779ad3 100644 --- a/src/pages/storage/containers/Volume/actions/ChangeType.jsx +++ b/src/pages/storage/containers/Volume/actions/ChangeType.jsx @@ -16,7 +16,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalVolumeStore from 'stores/cinder/volume'; import globalVolumeTypeStore from 'stores/cinder/volume-type'; -import { isAvailableOrInUse, isOsDisk } from 'resources/volume'; +import { isAvailableOrInUse, isOsDisk } from 'resources/cinder/volume'; export class ChangeType extends ModalAction { static id = 'change-type'; diff --git a/src/pages/storage/containers/Volume/actions/CloneVolume.jsx b/src/pages/storage/containers/Volume/actions/CloneVolume.jsx index 0fa6d9a0..59c62d90 100644 --- a/src/pages/storage/containers/Volume/actions/CloneVolume.jsx +++ b/src/pages/storage/containers/Volume/actions/CloneVolume.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalVolumeStore from 'stores/cinder/volume'; -import { isAvailableOrInUse } from 'resources/volume'; +import { isAvailableOrInUse } from 'resources/cinder/volume'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Volume/actions/Create/index.jsx b/src/pages/storage/containers/Volume/actions/Create/index.jsx index acc69369..cb33f219 100644 --- a/src/pages/storage/containers/Volume/actions/Create/index.jsx +++ b/src/pages/storage/containers/Volume/actions/Create/index.jsx @@ -16,7 +16,11 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import Confirm from 'components/Confirm'; import { getSinceTime } from 'utils/time'; -import { volumeStatus, multiTip, snapshotTypeTip } from 'resources/volume'; +import { + volumeStatus, + multiTip, + snapshotTypeTip, +} from 'resources/cinder/volume'; import globalSnapshotStore from 'stores/cinder/snapshot'; import globalImageStore from 'stores/glance/image'; import globalVolumeStore from 'stores/cinder/volume'; @@ -33,8 +37,8 @@ import { getImageColumns, canImageCreateIronicInstance, canImageCreateInstance, -} from 'resources/image'; -import { volumeTypeSelectProps } from 'resources/volume-type'; +} from 'resources/glance/image'; +import { volumeTypeSelectProps } from 'resources/cinder/volume-type'; import { allSettled } from 'utils'; import styles from './index.less'; diff --git a/src/pages/storage/containers/Volume/actions/CreateBackup.jsx b/src/pages/storage/containers/Volume/actions/CreateBackup.jsx index c9ed0611..865e4dbf 100644 --- a/src/pages/storage/containers/Volume/actions/CreateBackup.jsx +++ b/src/pages/storage/containers/Volume/actions/CreateBackup.jsx @@ -15,8 +15,8 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalBackupStore from 'stores/cinder/backup'; -import { isAvailableOrInUse, isInUse } from 'resources/volume'; -import { createTip, backupModeList, modeTip } from 'resources/backup'; +import { isAvailableOrInUse, isInUse } from 'resources/cinder/volume'; +import { createTip, backupModeList, modeTip } from 'resources/cinder/backup'; export class CreateBackup extends ModalAction { static id = 'create-backup'; diff --git a/src/pages/storage/containers/Volume/actions/CreateImage.jsx b/src/pages/storage/containers/Volume/actions/CreateImage.jsx index 76e58c74..ca2e5a26 100644 --- a/src/pages/storage/containers/Volume/actions/CreateImage.jsx +++ b/src/pages/storage/containers/Volume/actions/CreateImage.jsx @@ -14,9 +14,9 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; -import { volumeCreateImageTypes, imageOS } from 'resources/image'; +import { volumeCreateImageTypes, imageOS } from 'resources/glance/image'; import globalVolumeStore from 'stores/cinder/volume'; -import { isAvailable } from 'resources/volume'; +import { isAvailable } from 'resources/cinder/volume'; export class CreateImage extends ModalAction { static id = 'create-image'; diff --git a/src/pages/storage/containers/Volume/actions/CreateInstance.jsx b/src/pages/storage/containers/Volume/actions/CreateInstance.jsx index fca82f9c..8000c2a7 100644 --- a/src/pages/storage/containers/Volume/actions/CreateInstance.jsx +++ b/src/pages/storage/containers/Volume/actions/CreateInstance.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import CreateInstance from 'pages/compute/containers/Instance/actions/StepCreate'; -import { canCreateInstance } from 'resources/volume'; +import { canCreateInstance } from 'resources/cinder/volume'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx b/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx index bfc1f9b4..1b2b1375 100644 --- a/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx +++ b/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalSnapshotStore from 'stores/cinder/snapshot'; -import { isAvailableOrInUse } from 'resources/volume'; +import { isAvailableOrInUse } from 'resources/cinder/volume'; import globalVolumeTypeStore from 'stores/cinder/volume-type'; @inject('rootStore') diff --git a/src/pages/storage/containers/Volume/actions/CreateTransfer.jsx b/src/pages/storage/containers/Volume/actions/CreateTransfer.jsx index a553d0b3..4e9bcfa9 100644 --- a/src/pages/storage/containers/Volume/actions/CreateTransfer.jsx +++ b/src/pages/storage/containers/Volume/actions/CreateTransfer.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalVolumeStore from 'stores/cinder/volume'; -import { isAvailable } from 'resources/volume'; +import { isAvailable } from 'resources/cinder/volume'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Volume/actions/Detach.jsx b/src/pages/storage/containers/Volume/actions/Detach.jsx index 4f1d1439..900a1f94 100644 --- a/src/pages/storage/containers/Volume/actions/Detach.jsx +++ b/src/pages/storage/containers/Volume/actions/Detach.jsx @@ -17,11 +17,11 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalServerStore from 'stores/nova/instance'; import { ServerGroupInstanceStore } from 'stores/skyline/server-group-instance'; -import { isInUse, isOsDisk } from 'resources/volume'; +import { isInUse, isOsDisk } from 'resources/cinder/volume'; import { instanceColumnsBackend, allowAttachVolumeInstance, -} from 'resources/instance'; +} from 'resources/nova/instance'; export class Detach extends ModalAction { static id = 'detach'; diff --git a/src/pages/storage/containers/Volume/actions/Edit.jsx b/src/pages/storage/containers/Volume/actions/Edit.jsx index b24e12a5..388eaad6 100644 --- a/src/pages/storage/containers/Volume/actions/Edit.jsx +++ b/src/pages/storage/containers/Volume/actions/Edit.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalVolumeStore from 'stores/cinder/volume'; -import { isAvailableOrInUse } from 'resources/volume'; +import { isAvailableOrInUse } from 'resources/cinder/volume'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Volume/actions/ExtendVolume.jsx b/src/pages/storage/containers/Volume/actions/ExtendVolume.jsx index a0831377..434b8873 100644 --- a/src/pages/storage/containers/Volume/actions/ExtendVolume.jsx +++ b/src/pages/storage/containers/Volume/actions/ExtendVolume.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalVolumeStore, { VolumeStore } from 'stores/cinder/volume'; -import { isAvailableOrInUse } from 'resources/volume'; +import { isAvailableOrInUse } from 'resources/cinder/volume'; import { get } from 'lodash'; import client from 'client'; import Notify from 'components/Notify'; diff --git a/src/pages/storage/containers/Volume/actions/Migrate.jsx b/src/pages/storage/containers/Volume/actions/Migrate.jsx index 01822b04..4ccf75dd 100644 --- a/src/pages/storage/containers/Volume/actions/Migrate.jsx +++ b/src/pages/storage/containers/Volume/actions/Migrate.jsx @@ -15,9 +15,9 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalVolumeStore from 'stores/cinder/volume'; -import { isAvailableOrInUse } from 'resources/volume'; +import { isAvailableOrInUse } from 'resources/cinder/volume'; import globalPoolStore from 'stores/cinder/pool'; -import { poolColumns } from 'resources/cinder-pool'; +import { poolColumns } from 'resources/cinder/cinder-pool'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/Volume/actions/Restore.jsx b/src/pages/storage/containers/Volume/actions/Restore.jsx index 7b77c3c2..d97ec0c8 100644 --- a/src/pages/storage/containers/Volume/actions/Restore.jsx +++ b/src/pages/storage/containers/Volume/actions/Restore.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import { VolumeStore } from 'stores/cinder/volume'; import globalSnapshotStore from 'stores/cinder/snapshot'; -import { volumeStatus } from 'resources/volume'; +import { volumeStatus } from 'resources/cinder/volume'; import { getSinceTime } from 'utils/time'; export class RestoreAction extends ModalAction { diff --git a/src/pages/storage/containers/Volume/index.jsx b/src/pages/storage/containers/Volume/index.jsx index 0fafcbd2..1b3a9da1 100644 --- a/src/pages/storage/containers/Volume/index.jsx +++ b/src/pages/storage/containers/Volume/index.jsx @@ -18,7 +18,7 @@ import { volumeTransitionStatuses, volumeFilters, getVolumeColumnsList, -} from 'resources/volume'; +} from 'resources/cinder/volume'; import globalVolumeStore, { VolumeStore } from 'stores/cinder/volume'; import { InstanceVolumeStore } from 'stores/nova/instance-volume'; import { emptyActionConfig } from 'utils/constants'; diff --git a/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx b/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx index 643e1740..114120f5 100644 --- a/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx +++ b/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import { QosSpecStore } from 'stores/cinder/qos-spec'; import Base from 'containers/TabDetail'; -import { consumerTypes } from 'resources/volume-type'; +import { consumerTypes } from 'resources/cinder/volume-type'; import ExtraSpec from './ExtraSpec'; import actionConfigs from '../actions'; diff --git a/src/pages/storage/containers/VolumeType/QosSpec/index.jsx b/src/pages/storage/containers/VolumeType/QosSpec/index.jsx index e87cf074..c84b0718 100644 --- a/src/pages/storage/containers/VolumeType/QosSpec/index.jsx +++ b/src/pages/storage/containers/VolumeType/QosSpec/index.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import { consumerTypes } from 'resources/volume-type'; +import { consumerTypes } from 'resources/cinder/volume-type'; import globalQosSpecStore from 'stores/cinder/qos-spec'; import actionConfigs from './actions'; diff --git a/src/pages/storage/containers/VolumeType/VolumeType/Detail/BaseDetail.jsx b/src/pages/storage/containers/VolumeType/VolumeType/Detail/BaseDetail.jsx index 816a9061..01f59e6c 100644 --- a/src/pages/storage/containers/VolumeType/VolumeType/Detail/BaseDetail.jsx +++ b/src/pages/storage/containers/VolumeType/VolumeType/Detail/BaseDetail.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/BaseDetail'; -import { controls } from 'resources/volume-type'; +import { controls } from 'resources/cinder/volume-type'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/Create.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/Create.jsx index e38ed68b..75066771 100644 --- a/src/pages/storage/containers/VolumeType/VolumeType/actions/Create.jsx +++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/Create.jsx @@ -15,10 +15,10 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; import globalVolumeTypeStore from 'stores/cinder/volume-type'; -import { projectTableOptions } from 'resources/project'; +import { projectTableOptions } from 'resources/keystone/project'; import { ProjectStore } from 'stores/keystone/project'; import { toJS } from 'mobx'; -import { multiTip } from 'resources/volume'; +import { multiTip } from 'resources/cinder/volume'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageAccess.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageAccess.jsx index 05b2b38d..d2d1764d 100644 --- a/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageAccess.jsx +++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageAccess.jsx @@ -18,7 +18,7 @@ import globalVolumeTypeStore, { } from 'stores/cinder/volume-type'; import { ModalAction } from 'containers/Action'; import { ProjectStore } from 'stores/keystone/project'; -import { projectTableOptions } from 'resources/project'; +import { projectTableOptions } from 'resources/keystone/project'; @inject('rootStore') @observer diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx index 5a876d74..c4b7b552 100644 --- a/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx +++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; -import { consumerTypes } from 'resources/volume-type'; +import { consumerTypes } from 'resources/cinder/volume-type'; import globalQosSpecStore from 'stores/cinder/qos-spec'; @inject('rootStore') diff --git a/src/pages/storage/containers/VolumeType/VolumeType/index.jsx b/src/pages/storage/containers/VolumeType/VolumeType/index.jsx index 15aaf0bd..631f8ca7 100644 --- a/src/pages/storage/containers/VolumeType/VolumeType/index.jsx +++ b/src/pages/storage/containers/VolumeType/VolumeType/index.jsx @@ -18,7 +18,7 @@ import globalVolumeTypeStore, { VolumeTypeStore, } from 'stores/cinder/volume-type'; import { has } from 'lodash'; -import { multiTip } from 'resources/volume'; +import { multiTip } from 'resources/cinder/volume'; import actionConfigs from './actions'; @inject('rootStore') diff --git a/src/pages/user-center/containers/Credentials/actions/Create.jsx b/src/pages/user-center/containers/Credentials/actions/Create.jsx index 84728282..2ee63745 100644 --- a/src/pages/user-center/containers/Credentials/actions/Create.jsx +++ b/src/pages/user-center/containers/Credentials/actions/Create.jsx @@ -19,7 +19,7 @@ import moment from 'moment'; import globalRootStore from 'stores/root'; import { toJS } from 'mobx'; import FileSaver from 'file-saver'; -import rolePermission from 'resources/role'; +import rolePermission from 'resources/keystone/role'; export class Create extends ModalAction { static id = 'create-application_credentials'; diff --git a/src/pages/user-center/containers/Credentials/index.jsx b/src/pages/user-center/containers/Credentials/index.jsx index ea4eba33..ada1c861 100644 --- a/src/pages/user-center/containers/Credentials/index.jsx +++ b/src/pages/user-center/containers/Credentials/index.jsx @@ -18,7 +18,7 @@ import { Row, Col } from 'antd'; import Base from 'containers/List'; import { CredentialStore } from 'stores/keystone/credential'; import globalRootStore from 'stores/root'; -import rolePermission from 'resources/role'; +import rolePermission from 'resources/keystone/role'; import { actionConfigs, detailConfigs } from './actions'; export class Credentials extends Base { diff --git a/src/resources/backup.jsx b/src/resources/cinder/backup.jsx similarity index 100% rename from src/resources/backup.jsx rename to src/resources/cinder/backup.jsx diff --git a/src/resources/cinder-pool.jsx b/src/resources/cinder/cinder-pool.jsx similarity index 100% rename from src/resources/cinder-pool.jsx rename to src/resources/cinder/cinder-pool.jsx diff --git a/src/resources/volume-type.js b/src/resources/cinder/volume-type.js similarity index 100% rename from src/resources/volume-type.js rename to src/resources/cinder/volume-type.js diff --git a/src/resources/volume.jsx b/src/resources/cinder/volume.jsx similarity index 100% rename from src/resources/volume.jsx rename to src/resources/cinder/volume.jsx diff --git a/src/resources/image.jsx b/src/resources/glance/image.jsx similarity index 100% rename from src/resources/image.jsx rename to src/resources/glance/image.jsx diff --git a/src/resources/stack.js b/src/resources/heat/stack.js similarity index 100% rename from src/resources/stack.js rename to src/resources/heat/stack.js diff --git a/src/resources/ironic.js b/src/resources/ironic/ironic.js similarity index 100% rename from src/resources/ironic.js rename to src/resources/ironic/ironic.js diff --git a/src/resources/openstack-rc.js b/src/resources/keystone/openstack-rc.js similarity index 100% rename from src/resources/openstack-rc.js rename to src/resources/keystone/openstack-rc.js diff --git a/src/resources/policy.js b/src/resources/keystone/policy.js similarity index 100% rename from src/resources/policy.js rename to src/resources/keystone/policy.js diff --git a/src/resources/project.js b/src/resources/keystone/project.js similarity index 100% rename from src/resources/project.js rename to src/resources/keystone/project.js diff --git a/src/resources/role.js b/src/resources/keystone/role.js similarity index 100% rename from src/resources/role.js rename to src/resources/keystone/role.js diff --git a/src/resources/floatingip.js b/src/resources/neutron/floatingip.js similarity index 100% rename from src/resources/floatingip.js rename to src/resources/neutron/floatingip.js diff --git a/src/resources/network.jsx b/src/resources/neutron/network.jsx similarity index 100% rename from src/resources/network.jsx rename to src/resources/neutron/network.jsx diff --git a/src/resources/neutron.js b/src/resources/neutron/neutron.js similarity index 100% rename from src/resources/neutron.js rename to src/resources/neutron/neutron.js diff --git a/src/resources/port.jsx b/src/resources/neutron/port.jsx similarity index 100% rename from src/resources/port.jsx rename to src/resources/neutron/port.jsx diff --git a/src/resources/qos-policy.jsx b/src/resources/neutron/qos-policy.jsx similarity index 100% rename from src/resources/qos-policy.jsx rename to src/resources/neutron/qos-policy.jsx diff --git a/src/resources/router.jsx b/src/resources/neutron/router.jsx similarity index 98% rename from src/resources/router.jsx rename to src/resources/neutron/router.jsx index 56a268b9..ca879758 100644 --- a/src/resources/router.jsx +++ b/src/resources/neutron/router.jsx @@ -14,7 +14,10 @@ import React from 'react'; import globalRouterStore from 'stores/neutron/router'; -import { getPortsWithFixedIPs, getSubnetToRouter } from 'resources/floatingip'; +import { + getPortsWithFixedIPs, + getSubnetToRouter, +} from 'resources/neutron/floatingip'; import { getOptions } from 'utils'; export const routerStatus = { diff --git a/src/resources/security-group-rule.jsx b/src/resources/neutron/security-group-rule.jsx similarity index 100% rename from src/resources/security-group-rule.jsx rename to src/resources/neutron/security-group-rule.jsx diff --git a/src/resources/security-group.jsx b/src/resources/neutron/security-group.jsx similarity index 100% rename from src/resources/security-group.jsx rename to src/resources/neutron/security-group.jsx diff --git a/src/resources/topology-color.js b/src/resources/neutron/topology-color.js similarity index 100% rename from src/resources/topology-color.js rename to src/resources/neutron/topology-color.js diff --git a/src/resources/vpn.js b/src/resources/neutron/vpn.js similarity index 100% rename from src/resources/vpn.js rename to src/resources/neutron/vpn.js diff --git a/src/resources/flavor.js b/src/resources/nova/flavor.js similarity index 100% rename from src/resources/flavor.js rename to src/resources/nova/flavor.js diff --git a/src/resources/hypervisor.jsx b/src/resources/nova/hypervisor.jsx similarity index 100% rename from src/resources/hypervisor.jsx rename to src/resources/nova/hypervisor.jsx diff --git a/src/resources/instance.jsx b/src/resources/nova/instance.jsx similarity index 100% rename from src/resources/instance.jsx rename to src/resources/nova/instance.jsx diff --git a/src/resources/server-group.js b/src/resources/nova/server-group.js similarity index 100% rename from src/resources/server-group.js rename to src/resources/nova/server-group.js diff --git a/src/resources/service.js b/src/resources/nova/service.js similarity index 100% rename from src/resources/service.js rename to src/resources/nova/service.js diff --git a/src/resources/lb.js b/src/resources/octavia/lb.js similarity index 100% rename from src/resources/lb.js rename to src/resources/octavia/lb.js diff --git a/src/resources/pool.js b/src/resources/octavia/pool.js similarity index 100% rename from src/resources/pool.js rename to src/resources/octavia/pool.js diff --git a/src/resources/metricDict.js b/src/resources/prometheus/metricDict.js similarity index 100% rename from src/resources/metricDict.js rename to src/resources/prometheus/metricDict.js diff --git a/src/resources/monitoring.js b/src/resources/prometheus/monitoring.js similarity index 100% rename from src/resources/monitoring.js rename to src/resources/prometheus/monitoring.js diff --git a/src/resources/container.js b/src/resources/swift/container.js similarity index 100% rename from src/resources/container.js rename to src/resources/swift/container.js diff --git a/src/resources/database.js b/src/resources/trove/database.js similarity index 87% rename from src/resources/database.js rename to src/resources/trove/database.js index 539f1d58..c8a9fe76 100644 --- a/src/resources/database.js +++ b/src/resources/trove/database.js @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { instanceStatus } from 'resources/instance'; +import { instanceStatus } from 'resources/nova/instance'; export const InstanceStatus = { ...instanceStatus, @@ -27,4 +27,4 @@ export const InstanceStatus = { EJECT: t('Eject'), }; -export { default as policyType } from './server-group'; +export { default as policyType } from '../nova/server-group'; diff --git a/src/stores/cinder/volume.js b/src/stores/cinder/volume.js index 1cdb4d0d..11d2bbb6 100644 --- a/src/stores/cinder/volume.js +++ b/src/stores/cinder/volume.js @@ -13,7 +13,7 @@ // limitations under the License. import { action, observable } from 'mobx'; -import { isOsDisk } from 'resources/volume'; +import { isOsDisk } from 'resources/cinder/volume'; import { renderFilterMap } from 'utils/index'; import client from 'client'; import Base from 'stores/base'; diff --git a/src/stores/glance/image.js b/src/stores/glance/image.js index ffc1a2a6..d87eac11 100644 --- a/src/stores/glance/image.js +++ b/src/stores/glance/image.js @@ -15,7 +15,7 @@ import { action, observable } from 'mobx'; import client from 'client'; import Base from 'stores/base'; -import { imageOS } from 'resources/image'; +import { imageOS } from 'resources/glance/image'; import { isString } from 'lodash'; export class ImageStore extends Base { diff --git a/src/stores/neutron/network.js b/src/stores/neutron/network.js index 2fa21519..d1d65c1e 100644 --- a/src/stores/neutron/network.js +++ b/src/stores/neutron/network.js @@ -17,7 +17,7 @@ import networkUtils from 'src/pages/network/containers/Network/actions/networkUt import { get } from 'lodash'; import globalProjectStore from 'stores/keystone/project'; import client from 'client'; -import { isExternalNetwork } from 'resources/network'; +import { isExternalNetwork } from 'resources/neutron/network'; import Base from 'stores/base'; const { splitToArray } = networkUtils; diff --git a/src/stores/neutron/security-group.js b/src/stores/neutron/security-group.js index 9873b1a0..6e5ddc45 100644 --- a/src/stores/neutron/security-group.js +++ b/src/stores/neutron/security-group.js @@ -13,7 +13,7 @@ // limitations under the License. import { action } from 'mobx'; -import { mapperRule } from 'resources/security-group-rule'; +import { mapperRule } from 'resources/neutron/security-group-rule'; import client from 'client'; import Base from 'stores/base'; import globalProjectMapStore from 'stores/project'; diff --git a/src/stores/neutron/security-rule.js b/src/stores/neutron/security-rule.js index c356d0a1..83559f94 100644 --- a/src/stores/neutron/security-rule.js +++ b/src/stores/neutron/security-rule.js @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { mapperRule } from 'resources/security-group-rule'; +import { mapperRule } from 'resources/neutron/security-group-rule'; import client from 'client'; import Base from 'stores/base'; diff --git a/src/stores/nova/instance-volume.js b/src/stores/nova/instance-volume.js index 9c803229..b7899c78 100644 --- a/src/stores/nova/instance-volume.js +++ b/src/stores/nova/instance-volume.js @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { isOsDisk } from 'resources/volume'; +import { isOsDisk } from 'resources/cinder/volume'; import client from 'client'; import Base from 'stores/base'; diff --git a/src/stores/nova/instance.js b/src/stores/nova/instance.js index 17ccdce9..faf033cc 100644 --- a/src/stores/nova/instance.js +++ b/src/stores/nova/instance.js @@ -16,7 +16,7 @@ import { action, observable } from 'mobx'; import { get } from 'lodash'; import client from 'client'; import Base from 'stores/base'; -import { mapperRule } from 'resources/security-group-rule'; +import { mapperRule } from 'resources/neutron/security-group-rule'; import { RecycleBinStore } from '../skyline/recycle-server'; export class ServerStore extends Base { diff --git a/src/stores/root.js b/src/stores/root.js index 13839e5c..31c415f9 100644 --- a/src/stores/root.js +++ b/src/stores/root.js @@ -20,8 +20,8 @@ import { getQueryString } from 'utils/index'; import { setLocalStorageItem } from 'utils/local-storage'; import { isEmpty, values } from 'lodash'; -const checkItemPolicy = require('resources/policy').default; -const { onlyAdminCanReadPolicy } = require('resources/policy'); +const checkItemPolicy = require('resources/keystone/policy').default; +const { onlyAdminCanReadPolicy } = require('resources/keystone/policy'); export class RootStore { @observable diff --git a/src/resources/code.js b/src/utils/code.js similarity index 100% rename from src/resources/code.js rename to src/utils/code.js