From 463ced2667f4628dc45c04826e4fdc32e6b644e2 Mon Sep 17 00:00:00 2001
From: xusongfu <xu.songfu@99cloud.net>
Date: Wed, 23 Nov 2022 18:20:46 +0800
Subject: [PATCH] fix: Fix the store path in magnum and required name in zun
 container

1. Change the store path from 'src/stores' to 'stores' to avoid some strange bugs

2. Make the container name be required

Change-Id: If299e6791ce5c30be936fbd5fbc2b5427a59ff39
---
 .../actions/StepCreate/StepNodeSpec/index.jsx               | 6 +++---
 .../Clusters/actions/StepCreate/StepInfo/index.jsx          | 2 +-
 .../Containers/actions/StepCreate/StepInfo/index.jsx        | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/container-infra/containers/ClusterTemplates/actions/StepCreate/StepNodeSpec/index.jsx b/src/pages/container-infra/containers/ClusterTemplates/actions/StepCreate/StepNodeSpec/index.jsx
index 033d309c..af5df6ea 100644
--- a/src/pages/container-infra/containers/ClusterTemplates/actions/StepCreate/StepNodeSpec/index.jsx
+++ b/src/pages/container-infra/containers/ClusterTemplates/actions/StepCreate/StepNodeSpec/index.jsx
@@ -15,9 +15,9 @@
 import React from 'react';
 import { inject, observer } from 'mobx-react';
 import Base from 'components/Form';
-import globalImageStore from 'src/stores/glance/image';
-import globalKeypairStore from 'src/stores/nova/keypair';
-import FlavorSelectTable from 'src/pages/compute/containers/Instance/components/FlavorSelectTable';
+import globalImageStore from 'stores/glance/image';
+import globalKeypairStore from 'stores/nova/keypair';
+import FlavorSelectTable from 'pages/compute/containers/Instance/components/FlavorSelectTable';
 import { getImageColumns } from 'resources/glance/image';
 import { getKeyPairHeader } from 'resources/nova/keypair';
 
diff --git a/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepInfo/index.jsx b/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepInfo/index.jsx
index b6d0618a..2bd5a971 100644
--- a/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepInfo/index.jsx
+++ b/src/pages/container-infra/containers/Clusters/actions/StepCreate/StepInfo/index.jsx
@@ -65,7 +65,7 @@ export class StepInfo extends Base {
     const values = {};
     const { initKeyPair } = this.state;
     if (initKeyPair) {
-      values.keypairs = initKeyPair;
+      values.keypair = initKeyPair;
     }
 
     const { template } = this.locationParams;
diff --git a/src/pages/container-service/containers/Containers/actions/StepCreate/StepInfo/index.jsx b/src/pages/container-service/containers/Containers/actions/StepCreate/StepInfo/index.jsx
index ce655a12..4b41976f 100644
--- a/src/pages/container-service/containers/Containers/actions/StepCreate/StepInfo/index.jsx
+++ b/src/pages/container-service/containers/Containers/actions/StepCreate/StepInfo/index.jsx
@@ -66,6 +66,7 @@ export class StepInfo extends Base {
         label: t('Container Name'),
         type: 'input',
         placeholder: t('Container Name'),
+        required: true,
       },
       {
         name: 'images',