Skip to content

Commit

Permalink
Added tDn to l3extInstP service - l3extRsInstPToProfile object read f…
Browse files Browse the repository at this point in the history 
…unction
  • Loading branch information
@sajagana @lhercot
sajagana authored and lhercot committed Dec 9, 2022
1 parent a18254b commit d9e1e93
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 71 deletions.
50 changes: 19 additions & 31 deletions client/l3extInstP_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import (
)

func (sm *ServiceManager) CreateExternalNetworkInstanceProfile(name string, l3_outside string, tenant string, description string, l3extInstPattr models.ExternalNetworkInstanceProfileAttributes) (*models.ExternalNetworkInstanceProfile, error) {
rn := fmt.Sprintf("instP-%s", name)
parentDn := fmt.Sprintf("uni/tn-%s/out-%s", tenant, l3_outside)
rn := fmt.Sprintf(models.Rnl3extinstp, name)
parentDn := fmt.Sprintf(models.ParentDnl3extinstp, tenant, l3_outside)
l3extInstP := models.NewExternalNetworkInstanceProfile(rn, parentDn, description, l3extInstPattr)
err := sm.Save(l3extInstP)
return l3extInstP, err
}

func (sm *ServiceManager) ReadExternalNetworkInstanceProfile(name string, l3_outside string, tenant string) (*models.ExternalNetworkInstanceProfile, error) {
dn := fmt.Sprintf("uni/tn-%s/out-%s/instP-%s", tenant, l3_outside, name)
dn := fmt.Sprintf(models.Dnl3extinstp, tenant, l3_outside, name)
cont, err := sm.Get(dn)
if err != nil {
return nil, err
Expand All @@ -28,13 +28,13 @@ func (sm *ServiceManager) ReadExternalNetworkInstanceProfile(name string, l3_out
}

func (sm *ServiceManager) DeleteExternalNetworkInstanceProfile(name string, l3_outside string, tenant string) error {
dn := fmt.Sprintf("uni/tn-%s/out-%s/instP-%s", tenant, l3_outside, name)
dn := fmt.Sprintf(models.Dnl3extinstp, tenant, l3_outside, name)
return sm.DeleteByDn(dn, models.L3extinstpClassName)
}

func (sm *ServiceManager) UpdateExternalNetworkInstanceProfile(name string, l3_outside string, tenant string, description string, l3extInstPattr models.ExternalNetworkInstanceProfileAttributes) (*models.ExternalNetworkInstanceProfile, error) {
rn := fmt.Sprintf("instP-%s", name)
parentDn := fmt.Sprintf("uni/tn-%s/out-%s", tenant, l3_outside)
rn := fmt.Sprintf(models.Rnl3extinstp, name)
parentDn := fmt.Sprintf(models.ParentDnl3extinstp, tenant, l3_outside)
l3extInstP := models.NewExternalNetworkInstanceProfile(rn, parentDn, description, l3extInstPattr)

l3extInstP.Status = "modified"
Expand All @@ -44,10 +44,7 @@ func (sm *ServiceManager) UpdateExternalNetworkInstanceProfile(name string, l3_o
}

func (sm *ServiceManager) ListExternalNetworkInstanceProfile(l3_outside string, tenant string) ([]*models.ExternalNetworkInstanceProfile, error) {

baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/uni/tn-%s/out-%s/l3extInstP.json", baseurlStr, tenant, l3_outside)

dnUrl := fmt.Sprintf("%s/%s/l3extInstP.json", models.BaseurlStr, fmt.Sprintf(models.ParentDnl3extinstp, tenant, l3_outside))
cont, err := sm.GetViaURL(dnUrl)
list := models.ExternalNetworkInstanceProfileListFromContainer(cont)

Expand Down Expand Up @@ -88,8 +85,7 @@ func (sm *ServiceManager) DeleteRelationfvRsSecInheritedFromExternalNetworkInsta
}

func (sm *ServiceManager) ReadRelationfvRsSecInheritedFromExternalNetworkInstanceProfile(parentDn string) (interface{}, error) {
baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/%s/%s.json", baseurlStr, parentDn, "fvRsSecInherited")
dnUrl := fmt.Sprintf("%s/%s/%s.json", models.BaseurlStr, parentDn, "fvRsSecInherited")
cont, err := sm.GetViaURL(dnUrl)

contList := models.ListFromContainer(cont, "fvRsSecInherited")
Expand Down Expand Up @@ -138,8 +134,7 @@ func (sm *ServiceManager) DeleteRelationfvRsProvFromExternalNetworkInstanceProfi
}

func (sm *ServiceManager) ReadRelationfvRsProvFromExternalNetworkInstanceProfile(parentDn string) (interface{}, error) {
baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/%s/%s.json", baseurlStr, parentDn, "fvRsProv")
dnUrl := fmt.Sprintf("%s/%s/%s.json", models.BaseurlStr, parentDn, "fvRsProv")
cont, err := sm.GetViaURL(dnUrl)

contList := models.ListFromContainer(cont, "fvRsProv")
Expand Down Expand Up @@ -184,8 +179,7 @@ func (sm *ServiceManager) CreateRelationl3extRsL3InstPToDomPFromExternalNetworkI
}

func (sm *ServiceManager) ReadRelationl3extRsL3InstPToDomPFromExternalNetworkInstanceProfile(parentDn string) (interface{}, error) {
baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/%s/%s.json", baseurlStr, parentDn, "l3extRsL3InstPToDomP")
dnUrl := fmt.Sprintf("%s/%s/%s.json", models.BaseurlStr, parentDn, "l3extRsL3InstPToDomP")
cont, err := sm.GetViaURL(dnUrl)

contList := models.ListFromContainer(cont, "l3extRsL3InstPToDomP")
Expand Down Expand Up @@ -233,8 +227,7 @@ func (sm *ServiceManager) DeleteRelationl3extRsInstPToNatMappingEPgFromExternalN
}

func (sm *ServiceManager) ReadRelationl3extRsInstPToNatMappingEPgFromExternalNetworkInstanceProfile(parentDn string) (interface{}, error) {
baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/%s/%s.json", baseurlStr, parentDn, "l3extRsInstPToNatMappingEPg")
dnUrl := fmt.Sprintf("%s/%s/%s.json", models.BaseurlStr, parentDn, "l3extRsInstPToNatMappingEPg")
cont, err := sm.GetViaURL(dnUrl)

contList := models.ListFromContainer(cont, "l3extRsInstPToNatMappingEPg")
Expand Down Expand Up @@ -281,8 +274,7 @@ func (sm *ServiceManager) DeleteRelationfvRsConsIfFromExternalNetworkInstancePro
}

func (sm *ServiceManager) ReadRelationfvRsConsIfFromExternalNetworkInstanceProfile(parentDn string) (interface{}, error) {
baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/%s/%s.json", baseurlStr, parentDn, "fvRsConsIf")
dnUrl := fmt.Sprintf("%s/%s/%s.json", models.BaseurlStr, parentDn, "fvRsConsIf")
cont, err := sm.GetViaURL(dnUrl)

contList := models.ListFromContainer(cont, "fvRsConsIf")
Expand Down Expand Up @@ -327,8 +319,7 @@ func (sm *ServiceManager) CreateRelationfvRsCustQosPolFromExternalNetworkInstanc
}

func (sm *ServiceManager) ReadRelationfvRsCustQosPolFromExternalNetworkInstanceProfile(parentDn string) (interface{}, error) {
baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/%s/%s.json", baseurlStr, parentDn, "fvRsCustQosPol")
dnUrl := fmt.Sprintf("%s/%s/%s.json", models.BaseurlStr, parentDn, "fvRsCustQosPol")
cont, err := sm.GetViaURL(dnUrl)

contList := models.ListFromContainer(cont, "fvRsCustQosPol")
Expand Down Expand Up @@ -375,8 +366,7 @@ func (sm *ServiceManager) DeleteRelationl3extRsInstPToProfileFromExternalNetwork
}

func (sm *ServiceManager) ReadRelationl3extRsInstPToProfileFromExternalNetworkInstanceProfile(parentDn string) (interface{}, error) {
baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/%s/%s.json", baseurlStr, parentDn, "l3extRsInstPToProfile")
dnUrl := fmt.Sprintf("%s/%s/%s.json", models.BaseurlStr, parentDn, "l3extRsInstPToProfile")
cont, err := sm.GetViaURL(dnUrl)

contList := models.ListFromContainer(cont, "l3extRsInstPToProfile")
Expand All @@ -385,7 +375,8 @@ func (sm *ServiceManager) ReadRelationl3extRsInstPToProfileFromExternalNetworkIn

for _, contItem := range contList {
paramMap := make(map[string]string)
paramMap["tnRtctrlProfileName"] = models.G(contItem, "tDn")
paramMap["tDn"] = models.G(contItem, "tDn")
paramMap["tnRtctrlProfileName"] = models.G(contItem, "tnRtctrlProfileName")
paramMap["direction"] = models.G(contItem, "direction")

st = append(st, paramMap)
Expand Down Expand Up @@ -429,8 +420,7 @@ func (sm *ServiceManager) DeleteRelationfvRsConsFromExternalNetworkInstanceProfi
}

func (sm *ServiceManager) ReadRelationfvRsConsFromExternalNetworkInstanceProfile(parentDn string) (interface{}, error) {
baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/%s/%s.json", baseurlStr, parentDn, "fvRsCons")
dnUrl := fmt.Sprintf("%s/%s/%s.json", models.BaseurlStr, parentDn, "fvRsCons")
cont, err := sm.GetViaURL(dnUrl)

contList := models.ListFromContainer(cont, "fvRsCons")
Expand Down Expand Up @@ -479,8 +469,7 @@ func (sm *ServiceManager) DeleteRelationfvRsProtByFromExternalNetworkInstancePro
}

func (sm *ServiceManager) ReadRelationfvRsProtByFromExternalNetworkInstanceProfile(parentDn string) (interface{}, error) {
baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/%s/%s.json", baseurlStr, parentDn, "fvRsProtBy")
dnUrl := fmt.Sprintf("%s/%s/%s.json", models.BaseurlStr, parentDn, "fvRsProtBy")
cont, err := sm.GetViaURL(dnUrl)

contList := models.ListFromContainer(cont, "fvRsProtBy")
Expand Down Expand Up @@ -529,8 +518,7 @@ func (sm *ServiceManager) DeleteRelationfvRsIntraEpgFromExternalNetworkInstanceP
}

func (sm *ServiceManager) ReadRelationfvRsIntraEpgFromExternalNetworkInstanceProfile(parentDn string) (interface{}, error) {
baseurlStr := "/api/node/class"
dnUrl := fmt.Sprintf("%s/%s/%s.json", baseurlStr, parentDn, "fvRsIntraEpg")
dnUrl := fmt.Sprintf("%s/%s/%s.json", models.BaseurlStr, parentDn, "fvRsIntraEpg")
cont, err := sm.GetViaURL(dnUrl)

contList := models.ListFromContainer(cont, "fvRsIntraEpg")
Expand Down
60 changes: 20 additions & 40 deletions models/l3ext_inst_p.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,28 @@ import (
"github.com/ciscoecosystem/aci-go-client/v2/container"
)

const L3extinstpClassName = "l3extInstP"
const (
Dnl3extinstp = "uni/tn-%s/out-%s/instP-%s"
Rnl3extinstp = "instP-%s"
ParentDnl3extinstp = "uni/tn-%s/out-%s"
L3extinstpClassName = "l3extInstP"
)

type ExternalNetworkInstanceProfile struct {
BaseAttributes
ExternalNetworkInstanceProfileAttributes
}

type ExternalNetworkInstanceProfileAttributes struct {
Name string `json:",omitempty"`

Annotation string `json:",omitempty"`

Name string `json:",omitempty"`
Annotation string `json:",omitempty"`
ExceptionTag string `json:",omitempty"`

FloodOnEncap string `json:",omitempty"`

MatchT string `json:",omitempty"`

NameAlias string `json:",omitempty"`

PrefGrMemb string `json:",omitempty"`

Prio string `json:",omitempty"`

TargetDscp string `json:",omitempty"`
MatchT string `json:",omitempty"`
NameAlias string `json:",omitempty"`
PrefGrMemb string `json:",omitempty"`
Prio string `json:",omitempty"`
TargetDscp string `json:",omitempty"`
}

func NewExternalNetworkInstanceProfile(l3extInstPRn, parentDn, description string, l3extInstPattr ExternalNetworkInstanceProfileAttributes) *ExternalNetworkInstanceProfile {
Expand All @@ -56,21 +53,13 @@ func (l3extInstP *ExternalNetworkInstanceProfile) ToMap() (map[string]string, er
}

A(l3extInstPMap, "name", l3extInstP.Name)

A(l3extInstPMap, "annotation", l3extInstP.Annotation)

A(l3extInstPMap, "exceptionTag", l3extInstP.ExceptionTag)

A(l3extInstPMap, "floodOnEncap", l3extInstP.FloodOnEncap)

A(l3extInstPMap, "matchT", l3extInstP.MatchT)

A(l3extInstPMap, "nameAlias", l3extInstP.NameAlias)

A(l3extInstPMap, "prefGrMemb", l3extInstP.PrefGrMemb)

A(l3extInstPMap, "prio", l3extInstP.Prio)

A(l3extInstPMap, "targetDscp", l3extInstP.TargetDscp)

return l3extInstPMap, err
Expand All @@ -89,24 +78,15 @@ func ExternalNetworkInstanceProfileFromContainerList(cont *container.Container,
},

ExternalNetworkInstanceProfileAttributes{

Name: G(ExternalNetworkInstanceProfileCont, "name"),

Annotation: G(ExternalNetworkInstanceProfileCont, "annotation"),

Name: G(ExternalNetworkInstanceProfileCont, "name"),
Annotation: G(ExternalNetworkInstanceProfileCont, "annotation"),
ExceptionTag: G(ExternalNetworkInstanceProfileCont, "exceptionTag"),

FloodOnEncap: G(ExternalNetworkInstanceProfileCont, "floodOnEncap"),

MatchT: G(ExternalNetworkInstanceProfileCont, "matchT"),

NameAlias: G(ExternalNetworkInstanceProfileCont, "nameAlias"),

PrefGrMemb: G(ExternalNetworkInstanceProfileCont, "prefGrMemb"),

Prio: G(ExternalNetworkInstanceProfileCont, "prio"),

TargetDscp: G(ExternalNetworkInstanceProfileCont, "targetDscp"),
MatchT: G(ExternalNetworkInstanceProfileCont, "matchT"),
NameAlias: G(ExternalNetworkInstanceProfileCont, "nameAlias"),
PrefGrMemb: G(ExternalNetworkInstanceProfileCont, "prefGrMemb"),
Prio: G(ExternalNetworkInstanceProfileCont, "prio"),
TargetDscp: G(ExternalNetworkInstanceProfileCont, "targetDscp"),
},
}
}
Expand Down

0 comments on commit d9e1e93

Please sign in to comment.