[Cy] Support vlan Id

harvester · Aug 17, 2023 · 6fcbb42 · 6fcbb42
1 parent 3ea3163
commit 6fcbb42
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/cypress/cypress.config.ts b/cypress/cypress.config.ts
@@ -31,7 +31,16 @@ export default defineConfig({
       url: 'https://download.opensuse.org/pub/opensuse/distribution/leap/15.3/appliances/openSUSE-Leap-15.3-JeOS.x86_64-15.3-OpenStack-Cloud-Current.qcow2',
     },
     nfsEndPoint: 'nfs://ip',
-    vlanIDs: [1, 2],
+    vlans: [
+      {
+        nic: 'ens7',
+        vlan: 100,
+      },
+      {
+        nic: 'ens8',
+        vlan: 104
+      }
+    ],
     sshKey: 'Your ssh public key, use for validate connect VM. e.g. ssh-rsa xxx',
     privateKeyPath: 'Your ssh private Key Path'
   },

diff --git a/cypress/cypress.env.json.example b/cypress/cypress.env.json.example
@@ -29,6 +29,16 @@
     "name": "cirros-0.5.2-aarch64-disk.img",
     "url": "https://github.com/cirros-dev/cirros/releases/download/0.5.2/cirros-0.5.2-aarch64-disk.img"
   },
+  "vlans": [
+    {
+      "nic": "ens7",
+      "vlan": 100
+    },
+    {
+      "nic": "ens8",
+      "vlan": 104
+    },
+  ],
   "sshKey": "ssh-rsa GgVY6KnKpJqrBd/BGuUoHhh/C3CXhDojb1G1Td6hktaUwH+Q== [email protected]",
   "privateKeyPath": "/Users/username/.ssh/id_rsa"
 }
diff --git a/cypress/testcases/networks/network.spec.ts b/cypress/testcases/networks/network.spec.ts
@@ -126,8 +126,7 @@ describe('Check network with Manual Mode', () => {
 
 
 export function CreateVlan1() {}
-// TODO: Require two vlan IDs
-describe.skip('Preset Vlans', () => {
+describe('Preset Vlans', () => {
   function createVlan(vlan: Vlan) {
     cy.intercept('POST', `/v1/harvester/k8s.cni.cncf.io.network-attachment-definitions`).as('create');
 
@@ -154,8 +153,8 @@ describe.skip('Preset Vlans', () => {
   }
 
   it('Create Vlan1', () => {
-    const vlanIDs = Cypress.env('vlanIDs') || [];
-    const vlan = vlanIDs[0]
+    const vlans = Cypress.env('vlans') || [];
+    const vlan = vlans[0].vlan
 
     cy.login();
 
@@ -167,9 +166,9 @@ describe.skip('Preset Vlans', () => {
     })
   });
 
-  it.skip('Create Vlan2', () => {
-    const vlanIDs = Cypress.env('vlanIDs') || [];
-    const vlan = vlanIDs[1]
+  it('Create Vlan2', () => {
+    const vlans = Cypress.env('vlans') || [];
+    const vlan = vlans[1].vlan
 
     cy.login();