From b8f94e5a74efa440bbb445c3478efff3a9b2601b Mon Sep 17 00:00:00 2001
From: Pierre Lafievre <pierre.lafievre@iguanesolutions.com>
Date: Mon, 13 Feb 2023 15:47:50 +0100
Subject: [PATCH] B #405: create ovs network without vlan id

---
 CHANGELOG.md                                      | 1 +
 opennebula/resource_opennebula_virtual_network.go | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3e769c5c..7044c4e69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 BUG FIXES:
 
 * resources/opennebula_virtual_machine: add transient state `LCM_INIT` (#410)
+* resources/opennebula_virtual_network: for `ovswitch` type the attributes `vlan_id` and `automatic_vlan_id` are optional (#405)
 
 NOTES:
 
diff --git a/opennebula/resource_opennebula_virtual_network.go b/opennebula/resource_opennebula_virtual_network.go
index b07a63e51..431de065d 100644
--- a/opennebula/resource_opennebula_virtual_network.go
+++ b/opennebula/resource_opennebula_virtual_network.go
@@ -406,9 +406,8 @@ func changeVNetGroup(d *schema.ResourceData, meta interface{}) error {
 	return nil
 }
 
-func validVlanType(intype string) int {
-	vlanType := []string{"802.1Q", "vxlan", "ovswitch"}
-	return inArray(intype, vlanType)
+func mandatoryVLAN(intype string) bool {
+	return inArray(intype, []string{"802.1Q", "vxlan"}) >= 0
 }
 
 func resourceOpennebulaVirtualNetworkCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -804,7 +803,7 @@ func generateVn(d *schema.ResourceData) (string, error) {
 	tpl.Add(vnk.Name, vnname)
 	tpl.Add(vnk.VNMad, vnmad)
 
-	if validVlanType(vnmad) >= 0 {
+	if mandatoryVLAN(vnmad) {
 		if d.Get("automatic_vlan_id") == true {
 			tpl.Add("AUTOMATIC_VLAN_ID", "YES")
 		} else if vlanid, ok := d.GetOk("vlan_id"); ok {