Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend VRF resource to use custom templates #120

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Extend VRF resource to use custom templates #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09173c7
Extend VRF resource
Feb 1, 2023
6b5fc91
Remove print statement
Feb 1, 2023
fff9a5e
Fix data source
Feb 1, 2023
9a1bacd
Update example
Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions dcnm/data_source_dcnm_vrf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,11 @@ func datasourceDCNMVRF() *schema.Resource {
Optional: true,
Computed: true,
},

"template_props": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"source": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -214,7 +218,12 @@ func datasourceDCNMVRFRead(d *schema.ResourceData, m interface{}) error {
if err != nil {
return err
}
setVRFAttributes(d, cont)

if stripQuotes(cont.S("vrfTemplate").String()) != "Default_VRF_Universal" {
setVRFCustomTemplateAttributes(d, cont)
} else {
setVRFAttributes(d, cont)
}

flag, err := checkvrfDeploy(dcnmClient, fabricName, dn)
if err != nil {
Expand Down
110 changes: 93 additions & 17 deletions dcnm/resource_dcnm_vrf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,11 @@ func resourceDCNMVRF() *schema.Resource {
Optional: true,
Computed: true,
},

"template_props": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
"source": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -442,6 +446,47 @@ func setVRFAttributes(d *schema.ResourceData, cont *container.Container) *schema
return d
}

func setVRFCustomTemplateAttributes(d *schema.ResourceData, cont *container.Container) *schema.ResourceData {
if cont.Exists("fabric") {
d.Set("fabric_name", stripQuotes(cont.S("fabric").String()))
}
d.Set("name", stripQuotes(cont.S("vrfName").String()))
d.Set("template", stripQuotes(cont.S("vrfTemplate").String()))
d.Set("extension_template", stripQuotes(cont.S("vrfExtensionTemplate").String()))
d.Set("segment_id", stripQuotes(cont.S("vrfId").String()))

if cont.Exists("serviceVrfTemplate") && stripQuotes(cont.S("serviceVrfTemplate").String()) != "null" {
d.Set("service_template", stripQuotes(cont.S("serviceVrfTemplate").String()))
}
if cont.Exists("source") && stripQuotes(cont.S("source").String()) != "null" {
d.Set("source", stripQuotes(cont.S("source").String()))
}

var strByte []byte
if cont.Exists("vrfTemplateConfig") {
strJson := models.G(cont, "vrfTemplateConfig")
strJson = strings.ReplaceAll(strJson, "\\", "")
strByte = []byte(strJson)
var vrfTemplateConfig map[string]string
json.Unmarshal(strByte, &vrfTemplateConfig)
props, ok := d.GetOk("template_props")

map2 := make(map[string]interface{})
for k := range props.(map[string]interface{}) {
map2[k] = vrfTemplateConfig[k]
}
if !ok {
d.Set("template_props", vrfTemplateConfig)
} else {

d.Set("template_props", map2)
}
}

d.SetId(stripQuotes(cont.S("vrfName").String()))
return d
}

func resourceDCNMVRFImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
log.Println("[DEBUG] Begining Importer ", d.Id())

Expand All @@ -465,7 +510,12 @@ func resourceDCNMVRFImporter(d *schema.ResourceData, m interface{}) ([]*schema.R
}
d.Set("deploy", flag)

stateImport := setVRFAttributes(d, cont)
var stateImport *schema.ResourceData
if stripQuotes(cont.S("vrfTemplate").String()) != "Default_VRF_Universal" {
stateImport = setVRFCustomTemplateAttributes(d, cont)
} else {
stateImport = setVRFAttributes(d, cont)
}

log.Println("[DEBUG] End of Importer ", d.Id())
return []*schema.ResourceData{stateImport}, nil
Expand Down Expand Up @@ -583,17 +633,28 @@ func resourceDCNMVRFCreate(d *schema.ResourceData, m interface{}) error {
if staticR, ok := d.GetOk("static_default_route"); ok {
configMap.StaticRoute = staticR.(string)
}
configMap.SegmentID = vrf.Id
configMap.VrfName = vrf.Name

confStr, err := json.Marshal(configMap)
if err != nil {
return err
if vrfConfig, ok := d.GetOk("template_props"); ok {
vrfConfigMap := vrfConfig.(map[string]interface{})
vrfConfigMap["vrfSegmentId"] = vrf.Id
vrfConfigMap["vrfName"] = vrf.Name
confStr, err := json.Marshal(vrfConfigMap)
if err != nil {
return err
}
vrf.Config = string(confStr)
} else {
configMap.SegmentID = vrf.Id
configMap.VrfName = vrf.Name
confStr, err := json.Marshal(configMap)
if err != nil {
return err
}
vrf.Config = string(confStr)
}
vrf.Config = string(confStr)

durl := fmt.Sprintf("/rest/top-down/fabrics/%s/vrfs", vrf.Fabric)
_, err = dcnmClient.Save(durl, &vrf)
_, err := dcnmClient.Save(durl, &vrf)
if err != nil {
return err
}
Expand Down Expand Up @@ -924,18 +985,29 @@ func resourceDCNMVRFUpdate(d *schema.ResourceData, m interface{}) error {
if staticR, ok := d.GetOk("static_default_route"); ok {
configMap.StaticRoute = staticR.(string)
}
configMap.SegmentID = vrf.Id
configMap.VrfName = vrf.Name

confStr, err := json.Marshal(configMap)
if err != nil {
return err
if vrfConfig, ok := d.GetOk("template_props"); ok {
vrfConfigMap := vrfConfig.(map[string]interface{})
vrfConfigMap["vrfSegmentId"] = vrf.Id
vrfConfigMap["vrfName"] = vrf.Name
confStr, err := json.Marshal(vrfConfigMap)
if err != nil {
return err
}
vrf.Config = string(confStr)
} else {
configMap.SegmentID = vrf.Id
configMap.VrfName = vrf.Name
confStr, err := json.Marshal(configMap)
if err != nil {
return err
}
vrf.Config = string(confStr)
}
vrf.Config = string(confStr)

dn := d.Id()
durl := fmt.Sprintf("/rest/top-down/fabrics/%s/vrfs/%s", vrf.Fabric, dn)
_, err = dcnmClient.Update(durl, &vrf)
_, err := dcnmClient.Update(durl, &vrf)
if err != nil {
return err
}
Expand Down Expand Up @@ -1200,7 +1272,11 @@ func resourceDCNMVRFRead(d *schema.ResourceData, m interface{}) error {
return err
}

setVRFAttributes(d, cont)
if _, ok := d.GetOk("template_props"); ok {
setVRFCustomTemplateAttributes(d, cont)
} else {
setVRFAttributes(d, cont)
}

flag, err := checkvrfDeploy(dcnmClient, fabricName, dn)
if err != nil {
Expand Down
36 changes: 35 additions & 1 deletion examples/vrf/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,38 @@ resource "dcnm_vrf" "second" {
loopback_id = 70
loopback_ipv4 = "1.2.3.4"
}
}
}

resource "dcnm_vrf" "third" {
fabric_name = "fab3"
name = "check3"
segment_id = 50050
template = "Template_Universal"
extension_template = "Template_Extension_Universal"
template_props = {
"advertiseDefaultRouteFlag" : "true"
"vrfVlanId" : "123"
"isRPExternal" : "false"
"vrfDescription" : ""
"maxBgpPaths" : "6"
"maxIbgpPaths" : "6"
"borderMaxBgpPaths" : "16"
"ipv6LinkLocalFlag" : "false"
"vrfRouteMap" : "RM_ADVERTISE_CONNECTED_SVI"
"ENABLE_NETFLOW" : "false"
"bgpPassword" : ""
"mtu" : "9000"
"multicastGroup" : ""
"isRPAbsent" : "false"
"advertiseHostRouteFlag" : "true"
"vrfVlanName" : ""
"trmEnabled" : "false"
"asn" : "4201020601"
"vrfIntfDescription" : ""
"vrfSegmentId" : "50050"
"vrfName" : "check3"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even if the VRF Name and the VRF Segment ID are inputs of the resource, the values must be set inside the template properties as well. Otherwise Terraform will try to update does values in a subsequent terraform apply. This is because the Read Operataion identifies those keys but the Schema does not have them

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same applies for the Network Resource in the PR #121

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. This PR is working for me. Tested it out with different scenarios.

}
attachments {
serial_number = "9ZGMF8CBZK5"
}
}