Merge "fix: Optimize the directory structure of the resources folder"

.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/.*$

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';
 

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';
 

src/components/FormItem/VolumeSelectTable/index.jsx

@@ -20,7 +20,7 @@ import {
   volumeColumns,
   volumeFilters,
   volumeSortProps,
-} from 'resources/volume';
+} from 'resources/cinder/volume';
 
 @inject('rootStore')
 @observer

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')

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')

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';
 

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';
 

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) {

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 {

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,

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';

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';

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';
 

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';

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

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

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';

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';

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')

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';

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';
 

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 {

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

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';

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';
 

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 {

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';
 

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

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

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';

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';

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';

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

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';
 

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() {

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';
 

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';

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';

src/pages/compute/containers/Image/actions/Create.jsx

@@ -21,11 +21,11 @@ import {
   imageFormats,
   imageFormatsConsole,
   imageVisibility,
-} from 'resources/image';
+} from 'resources/glance/image';
-import { cpuPolicyList, cpuThreadPolicyList } from 'resources/flavor';
+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() {

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

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 { canImageCreateIronicInstance } from 'resources/glance/image';
-import { canCreateIronicByEndpoint } from 'resources/instance';
+import { canCreateIronicByEndpoint } from 'resources/nova/instance';
 
 export class CreateIronic extends CreateInstance {
   static id = 'ironic-create';

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() {

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

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

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

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

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';

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';

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';

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';

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 { isNotError } from 'resources/nova/instance';
-import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/router';
+import { getCanReachSubnetIdsWithRouterIdInComponent } from 'resources/neutron/router';
 import {
   getInterfaceWithReason,
   handleFixedIPChange,
-} from 'resources/floatingip';
+} from 'resources/neutron/floatingip';
-import { getPortsAndReasons } from 'resources/port';
+import { getPortsAndReasons } from 'resources/neutron/port';
 
 @inject('rootStore')
 @observer

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;

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 { allowAttachVolumeInstance } from 'resources/nova/instance';
-import { multiTip } from 'resources/volume';
+import { multiTip } from 'resources/cinder/volume';
 import { get as _get } from 'lodash';
 
 export class AttachVolume extends ModalAction {

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

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;

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';
 

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';

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';

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';
 

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() {

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 { portStatus } from 'resources/neutron/port';
-import { isActiveOrShutOff, isNotLocked } from 'resources/instance';
+import { isActiveOrShutOff, isNotLocked } from 'resources/nova/instance';
 
 @inject('rootStore')
 @observer

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 { volumeStatus, isOsDisk } from 'resources/cinder/volume';
-import { allowAttachVolumeInstance } from 'resources/instance';
+import { allowAttachVolumeInstance } from 'resources/nova/instance';
 
 export class DetachVolume extends ModalAction {
   static id = 'detach-volume';

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

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 {

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')

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

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 {

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 {

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() {

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';

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 {

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 {

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 {

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';
 

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 {

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 {

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 {

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 {

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 {

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';
+} from 'resources/neutron/security-group';
-import { portColumns, portFilters } from 'resources/port';
+import { portColumns, portFilters } from 'resources/neutron/port';
 import { getLinkRender } from 'utils/route-map';
 
 // import EditYamlModal from 'components/Modals/EditYaml';

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 {
-import { physicalNodeTypes } from 'resources/instance';
+  hypervisorColumns,
+  hypervisorFilters,
+} from 'resources/nova/hypervisor';
+import { physicalNodeTypes } from 'resources/nova/instance';
 import { getOptions } from 'utils';
 
 export class SystemStep extends Base {

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';

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 {

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 {

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 {

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 {

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 {

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 {

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';

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')

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

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';
 

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 {

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 {

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';

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';

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';
 

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';
 

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';