Skip to content

Commit 48c9cf7

Browse files
Cacit issue 149 (#153)
* removed desc from required resources * removed desc * updated rest resource
1 parent 48bdbef commit 48c9cf7

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

aci/resource_aci_l3extdomp.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ func getRemoteL3DomainProfile(client *client.Client, dn string) (*models.L3Domai
8282

8383
func setL3DomainProfileAttributes(l3extDomP *models.L3DomainProfile, d *schema.ResourceData) *schema.ResourceData {
8484
d.SetId(l3extDomP.DistinguishedName)
85-
d.Set("description", l3extDomP.Description)
8685
l3extDomPMap, _ := l3extDomP.ToMap()
8786

8887
d.Set("name", l3extDomPMap["name"])
@@ -113,7 +112,6 @@ func resourceAciL3DomainProfileImport(d *schema.ResourceData, m interface{}) ([]
113112
func resourceAciL3DomainProfileCreate(d *schema.ResourceData, m interface{}) error {
114113
log.Printf("[DEBUG] L3DomainProfile: Beginning Creation")
115114
aciClient := m.(*client.Client)
116-
desc := d.Get("description").(string)
117115

118116
name := d.Get("name").(string)
119117

@@ -126,7 +124,7 @@ func resourceAciL3DomainProfileCreate(d *schema.ResourceData, m interface{}) err
126124
if NameAlias, ok := d.GetOk("name_alias"); ok {
127125
l3extDomPAttr.NameAlias = NameAlias.(string)
128126
}
129-
l3extDomP := models.NewL3DomainProfile(fmt.Sprintf("l3dom-%s", name), "uni", desc, l3extDomPAttr)
127+
l3extDomP := models.NewL3DomainProfile(fmt.Sprintf("l3dom-%s", name), "uni", "", l3extDomPAttr)
130128

131129
err := aciClient.Save(l3extDomP)
132130
if err != nil {
@@ -242,7 +240,6 @@ func resourceAciL3DomainProfileUpdate(d *schema.ResourceData, m interface{}) err
242240
log.Printf("[DEBUG] L3DomainProfile: Beginning Update")
243241

244242
aciClient := m.(*client.Client)
245-
desc := d.Get("description").(string)
246243

247244
name := d.Get("name").(string)
248245

@@ -255,7 +252,7 @@ func resourceAciL3DomainProfileUpdate(d *schema.ResourceData, m interface{}) err
255252
if NameAlias, ok := d.GetOk("name_alias"); ok {
256253
l3extDomPAttr.NameAlias = NameAlias.(string)
257254
}
258-
l3extDomP := models.NewL3DomainProfile(fmt.Sprintf("l3dom-%s", name), "uni", desc, l3extDomPAttr)
255+
l3extDomP := models.NewL3DomainProfile(fmt.Sprintf("l3dom-%s", name), "uni", "", l3extDomPAttr)
259256

260257
l3extDomP.Status = "modified"
261258

aci/resource_aci_physdomp.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ func getRemotePhysicalDomain(client *client.Client, dn string) (*models.Physical
7676

7777
func setPhysicalDomainAttributes(physDomP *models.PhysicalDomain, d *schema.ResourceData) *schema.ResourceData {
7878
d.SetId(physDomP.DistinguishedName)
79-
d.Set("description", physDomP.Description)
8079
physDomPMap, _ := physDomP.ToMap()
8180

8281
d.Set("name", physDomPMap["name"])
@@ -107,7 +106,6 @@ func resourceAciPhysicalDomainImport(d *schema.ResourceData, m interface{}) ([]*
107106
func resourceAciPhysicalDomainCreate(d *schema.ResourceData, m interface{}) error {
108107
log.Printf("[DEBUG] PhysicalDomain: Beginning Creation")
109108
aciClient := m.(*client.Client)
110-
desc := d.Get("description").(string)
111109

112110
name := d.Get("name").(string)
113111

@@ -120,7 +118,7 @@ func resourceAciPhysicalDomainCreate(d *schema.ResourceData, m interface{}) erro
120118
if NameAlias, ok := d.GetOk("name_alias"); ok {
121119
physDomPAttr.NameAlias = NameAlias.(string)
122120
}
123-
physDomP := models.NewPhysicalDomain(fmt.Sprintf("phys-%s", name), "uni", desc, physDomPAttr)
121+
physDomP := models.NewPhysicalDomain(fmt.Sprintf("phys-%s", name), "uni", "", physDomPAttr)
124122

125123
err := aciClient.Save(physDomP)
126124
if err != nil {
@@ -216,7 +214,6 @@ func resourceAciPhysicalDomainUpdate(d *schema.ResourceData, m interface{}) erro
216214
log.Printf("[DEBUG] PhysicalDomain: Beginning Update")
217215

218216
aciClient := m.(*client.Client)
219-
desc := d.Get("description").(string)
220217

221218
name := d.Get("name").(string)
222219

@@ -229,7 +226,7 @@ func resourceAciPhysicalDomainUpdate(d *schema.ResourceData, m interface{}) erro
229226
if NameAlias, ok := d.GetOk("name_alias"); ok {
230227
physDomPAttr.NameAlias = NameAlias.(string)
231228
}
232-
physDomP := models.NewPhysicalDomain(fmt.Sprintf("phys-%s", name), "uni", desc, physDomPAttr)
229+
physDomP := models.NewPhysicalDomain(fmt.Sprintf("phys-%s", name), "uni", "", physDomPAttr)
233230

234231
physDomP.Status = "modified"
235232

aci/resource_rest.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func resourceAciRestCreate(d *schema.ResourceData, m interface{}) error {
5959
}
6060
classNameIntf := d.Get("class_name")
6161
className := classNameIntf.(string)
62-
dn := cont.Search(className, "attributes", "dn").String()
62+
dn := models.StripQuotes(models.StripSquareBrackets(cont.Search(className, "attributes", "dn").String()))
6363

6464
if dn == "{}" {
6565
d.SetId(GetDN(d, m))
@@ -79,7 +79,7 @@ func resourceAciRestUpdate(d *schema.ResourceData, m interface{}) error {
7979
}
8080
classNameIntf := d.Get("class_name")
8181
className := classNameIntf.(string)
82-
dn := cont.Search(className, "attributes", "dn").String()
82+
dn := models.StripQuotes(models.StripSquareBrackets(cont.Search(className, "attributes", "dn").String()))
8383
if dn == "{}" {
8484
d.SetId(GetDN(d, m))
8585

0 commit comments

Comments
 (0)