From 3cb0a066fa8e18a99fd1a34af197a6f7666b8ecb Mon Sep 17 00:00:00 2001
From: nqb <nquiniou@akamai.com>
Date: Thu, 6 Jan 2022 07:38:12 +0100
Subject: [PATCH] cleanup before merge

---
 .../scenarios/inline/playbooks/configure.yml  |   2 +-
 .../10_run_configurator_step1.yml~            | 107 ------------------
 t/venom/vars/all.yml                          |   1 -
 3 files changed, 1 insertion(+), 109 deletions(-)
 delete mode 100644 t/venom/test_suites/configurator_inline/10_run_configurator_step1.yml~

diff --git a/t/venom/scenarios/inline/playbooks/configure.yml b/t/venom/scenarios/inline/playbooks/configure.yml
index e0a53c622787..b61e8b2995be 100644
--- a/t/venom/scenarios/inline/playbooks/configure.yml
+++ b/t/venom/scenarios/inline/playbooks/configure.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: pfservers
-  name: configure Golang environment for unit tests
+  name: configure Packetfence VM
   become: True
 
   tasks:
diff --git a/t/venom/test_suites/configurator_inline/10_run_configurator_step1.yml~ b/t/venom/test_suites/configurator_inline/10_run_configurator_step1.yml~
deleted file mode 100644
index 979f0485546f..000000000000
--- a/t/venom/test_suites/configurator_inline/10_run_configurator_step1.yml~
+++ /dev/null
@@ -1,107 +0,0 @@
-name: Run configurator step 1
-testcases:
-# get_name_of: one-liner to get name (ex: eth0) based on index (ex: 1, 2)  
-- name: get_name_of_mgmt_int
-  steps:
-  - type: exec
-    script: "ip -o link show | egrep -v '^1:' | grep '^{{.configurator.interfaces.mgmt.index}}' | awk -F ': ' '{print $2;}'"
-    vars:
-      mgmt_interface:
-        from: result.systemout
-
-- name: configure_mgmt_int
-  steps:
-  - type: http
-    method: PATCH
-    url: '{{.pfserver_webadmin_url}}/api/v1/configurator/config/interface/{{.get_name_of_mgmt_int.mgmt_interface}}'
-    ignore_verify_ssl: true
-    body: >-
-      {
-        "ipaddress": "{{.configurator.interfaces.mgmt.ip}}",
-        "netmask": "{{.configurator.interfaces.mgmt.netmask}}",
-        "type": "management",
-        "additional_listening_daemons": ["portal"]
-      }
-    headers:
-      "Content-Type": "application/json"
-    assertions:
-      - result.statuscode ShouldEqual 200
-
-- name: get_name_of_reg_int
-  steps:
-  - type: exec
-    script: "ip -o link show | egrep -v '^1:' | grep '^{{.configurator.interfaces.reg.index}}' | awk -F ': ' '{print $2;}'"
-    vars:
-      reg_interface:
-        from: result.systemout
-
-# workaround for Debian Vagrant box: interfaces are down if they don't have an IP
-- name: bounce_registration_int
-  steps:
-  - type: exec
-    script: "ip link set dev {{.get_name_of_reg_int.reg_interface}} up"
-
-- name: configure_registration_int
-  steps:
-  - type: http
-    method: PATCH
-    url: '{{.pfserver_webadmin_url}}/api/v1/configurator/config/interface/{{.get_name_of_reg_int.reg_interface}}'
-    ignore_verify_ssl: true
-    body: >-
-      {
-        "ipaddress": "{{.configurator.interfaces.reg.ip}}",
-        "netmask": "{{.configurator.interfaces.reg.netmask}}",
-        "type": "vlan-registration",
-        "dhcpd_enabled": "{{.configurator.interfaces.reg.dhcpd_enabled}}"
-      }
-    headers:
-      "Content-Type": "application/json"
-    assertions:
-      - result.statuscode ShouldEqual 200
-
-- name: get_name_of_iso_int
-  steps:
-  - type: exec
-    script: "ip -o link show | egrep -v '^1:' | grep '^{{.configurator.interfaces.iso.index}}' | awk -F ': ' '{print $2;}'"
-    vars:
-      iso_interface:
-        from: result.systemout
-
-# workaround for Debian Vagrant box: interfaces are down if they don't have an IP
-- name: bounce_isolation_int
-  steps:
-  - type: exec
-    script: "ip link set dev {{.get_name_of_iso_int.iso_interface}} up"
-
-- name: configure_isolation_int
-  steps:
-  - type: http
-    method: PATCH
-    url: '{{.pfserver_webadmin_url}}/api/v1/configurator/config/interface/{{.get_name_of_iso_int.iso_interface}}'
-    ignore_verify_ssl: true
-    body: >-
-      {
-        "ipaddress": "{{.configurator.interfaces.iso.ip}}",
-        "netmask": "{{.configurator.interfaces.iso.netmask}}",
-        "type": "vlan-isolation",
-        "dhcpd_enabled": "{{.configurator.interfaces.iso.dhcpd_enabled}}"
-      }
-    headers:
-      "Content-Type": "application/json"
-    assertions:
-      - result.statuscode ShouldEqual 200
-
-- name: configure_dns_servers
-  steps:
-  - type: http
-    method: PUT
-    url: '{{.pfserver_webadmin_url}}/api/v1/configurator/config/system/dns_servers'
-    ignore_verify_ssl: true
-    body: >-
-      {
-        "dns_servers": ["{{.configurator.dns.primary_ip}}", "{{.configurator.dns.secondary_ip}}"]
-      }
-    headers:
-      "Content-Type": "application/json"
-    assertions:
-      - result.statuscode ShouldEqual 200
diff --git a/t/venom/vars/all.yml b/t/venom/vars/all.yml
index 0c17a8a9722a..a32741190eae 100644
--- a/t/venom/vars/all.yml
+++ b/t/venom/vars/all.yml
@@ -444,7 +444,6 @@ pfdhcplistener_single_tenant.nodes.node10.dhcp_vendor: test
 # need to be a network not already attached to PacketFence server
 pfdhcplistener_single_tenant.nodes.node10.dhcp_server: 10.10.10.1
 
-inline_l2.pf_portal: 192.168.2.1
 ################################################################################
 # pfdhcplistener_multi_tenant test suite specific variables
 ################################################################################