Merge pull request #489 from pvasant/release_v0.1.214

Release v0.1.214

CHANGES.adoc

@@ -3,6 +3,12 @@
 This document describes the relevant changes between releases of the OCM API
 SDK.
 
+== 0.1.214 Oct 27 2021
+- Update to model 0.0.150:
+** Fix addon installation version (addon_version vs version)
+** Remove no_proxy attribute from SDK
+** Add body to the external tracking event
+
 == 0.1.213 Oct 26 2021
 
 - Update to model 0.0.42

Makefile

@@ -22,7 +22,7 @@ export GOPROXY=https://proxy.golang.org
 export CGO_ENABLED=0
 
 # Details of the model to use:
-model_version:=v0.0.149
+model_version:=v0.0.150
 model_url:=https://github.com/openshift-online/ocm-api-model.git
 
 # Details of the metamodel to use:

clustersmgmt/v1/add_on_installation_builder.go

@@ -31,14 +31,14 @@ type AddOnInstallationBuilder struct {
 	id                string
 	href              string
 	addon             *AddOnBuilder
+	addonVersion      *AddOnVersionBuilder
 	cluster           *ClusterBuilder
 	creationTimestamp time.Time
 	operatorVersion   string
 	parameters        *AddOnInstallationParameterListBuilder
 	state             AddOnInstallationState
 	stateDescription  string
 	updatedTimestamp  time.Time
-	version           *AddOnVersionBuilder
 }
 
 // NewAddOnInstallation creates a new builder of 'add_on_installation' objects.
@@ -79,6 +79,19 @@ func (b *AddOnInstallationBuilder) Addon(value *AddOnBuilder) *AddOnInstallation
 	return b
 }
 
+// AddonVersion sets the value of the 'addon_version' attribute to the given value.
+//
+// Representation of an add-on version.
+func (b *AddOnInstallationBuilder) AddonVersion(value *AddOnVersionBuilder) *AddOnInstallationBuilder {
+	b.addonVersion = value
+	if value != nil {
+		b.bitmap_ |= 16
+	} else {
+		b.bitmap_ &^= 16
+	}
+	return b
+}
+
 // Cluster sets the value of the 'cluster' attribute to the given value.
 //
 // Definition of an _OpenShift_ cluster.
@@ -121,9 +134,9 @@ func (b *AddOnInstallationBuilder) Addon(value *AddOnBuilder) *AddOnInstallation
 func (b *AddOnInstallationBuilder) Cluster(value *ClusterBuilder) *AddOnInstallationBuilder {
 	b.cluster = value
 	if value != nil {
-		b.bitmap_ |= 16
+		b.bitmap_ |= 32
 	} else {
-		b.bitmap_ &^= 16
+		b.bitmap_ &^= 32
 	}
 	return b
 }
@@ -133,7 +146,7 @@ func (b *AddOnInstallationBuilder) Cluster(value *ClusterBuilder) *AddOnInstalla
 //
 func (b *AddOnInstallationBuilder) CreationTimestamp(value time.Time) *AddOnInstallationBuilder {
 	b.creationTimestamp = value
-	b.bitmap_ |= 32
+	b.bitmap_ |= 64
 	return b
 }
 
@@ -142,7 +155,7 @@ func (b *AddOnInstallationBuilder) CreationTimestamp(value time.Time) *AddOnInst
 //
 func (b *AddOnInstallationBuilder) OperatorVersion(value string) *AddOnInstallationBuilder {
 	b.operatorVersion = value
-	b.bitmap_ |= 64
+	b.bitmap_ |= 128
 	return b
 }
 
@@ -151,7 +164,7 @@ func (b *AddOnInstallationBuilder) OperatorVersion(value string) *AddOnInstallat
 //
 func (b *AddOnInstallationBuilder) Parameters(value *AddOnInstallationParameterListBuilder) *AddOnInstallationBuilder {
 	b.parameters = value
-	b.bitmap_ |= 128
+	b.bitmap_ |= 256
 	return b
 }
 
@@ -160,7 +173,7 @@ func (b *AddOnInstallationBuilder) Parameters(value *AddOnInstallationParameterL
 // Representation of an add-on installation State field.
 func (b *AddOnInstallationBuilder) State(value AddOnInstallationState) *AddOnInstallationBuilder {
 	b.state = value
-	b.bitmap_ |= 256
+	b.bitmap_ |= 512
 	return b
 }
 
@@ -169,7 +182,7 @@ func (b *AddOnInstallationBuilder) State(value AddOnInstallationState) *AddOnIns
 //
 func (b *AddOnInstallationBuilder) StateDescription(value string) *AddOnInstallationBuilder {
 	b.stateDescription = value
-	b.bitmap_ |= 512
+	b.bitmap_ |= 1024
 	return b
 }
 
@@ -178,20 +191,7 @@ func (b *AddOnInstallationBuilder) StateDescription(value string) *AddOnInstalla
 //
 func (b *AddOnInstallationBuilder) UpdatedTimestamp(value time.Time) *AddOnInstallationBuilder {
 	b.updatedTimestamp = value
-	b.bitmap_ |= 1024
-	return b
-}
-
-// Version sets the value of the 'version' attribute to the given value.
-//
-// Representation of an add-on version.
-func (b *AddOnInstallationBuilder) Version(value *AddOnVersionBuilder) *AddOnInstallationBuilder {
-	b.version = value
-	if value != nil {
-		b.bitmap_ |= 2048
-	} else {
-		b.bitmap_ &^= 2048
-	}
+	b.bitmap_ |= 2048
 	return b
 }
 
@@ -208,6 +208,11 @@ func (b *AddOnInstallationBuilder) Copy(object *AddOnInstallation) *AddOnInstall
 	} else {
 		b.addon = nil
 	}
+	if object.addonVersion != nil {
+		b.addonVersion = NewAddOnVersion().Copy(object.addonVersion)
+	} else {
+		b.addonVersion = nil
+	}
 	if object.cluster != nil {
 		b.cluster = NewCluster().Copy(object.cluster)
 	} else {
@@ -223,11 +228,6 @@ func (b *AddOnInstallationBuilder) Copy(object *AddOnInstallation) *AddOnInstall
 	b.state = object.state
 	b.stateDescription = object.stateDescription
 	b.updatedTimestamp = object.updatedTimestamp
-	if object.version != nil {
-		b.version = NewAddOnVersion().Copy(object.version)
-	} else {
-		b.version = nil
-	}
 	return b
 }
 
@@ -243,6 +243,12 @@ func (b *AddOnInstallationBuilder) Build() (object *AddOnInstallation, err error
 			return
 		}
 	}
+	if b.addonVersion != nil {
+		object.addonVersion, err = b.addonVersion.Build()
+		if err != nil {
+			return
+		}
+	}
 	if b.cluster != nil {
 		object.cluster, err = b.cluster.Build()
 		if err != nil {
@@ -260,11 +266,5 @@ func (b *AddOnInstallationBuilder) Build() (object *AddOnInstallation, err error
 	object.state = b.state
 	object.stateDescription = b.stateDescription
 	object.updatedTimestamp = b.updatedTimestamp
-	if b.version != nil {
-		object.version, err = b.version.Build()
-		if err != nil {
-			return
-		}
-	}
 	return
 }

clustersmgmt/v1/add_on_installation_type.go

@@ -43,14 +43,14 @@ type AddOnInstallation struct {
 	id                string
 	href              string
 	addon             *AddOn
+	addonVersion      *AddOnVersion
 	cluster           *Cluster
 	creationTimestamp time.Time
 	operatorVersion   string
 	parameters        *AddOnInstallationParameterList
 	state             AddOnInstallationState
 	stateDescription  string
 	updatedTimestamp  time.Time
-	version           *AddOnVersion
 }
 
 // Kind returns the name of the type of the object.
@@ -133,12 +133,35 @@ func (o *AddOnInstallation) GetAddon() (value *AddOn, ok bool) {
 	return
 }
 
+// AddonVersion returns the value of the 'addon_version' attribute, or
+// the zero value of the type if the attribute doesn't have a value.
+//
+// Link to the installed version of this add-on.
+func (o *AddOnInstallation) AddonVersion() *AddOnVersion {
+	if o != nil && o.bitmap_&16 != 0 {
+		return o.addonVersion
+	}
+	return nil
+}
+
+// GetAddonVersion returns the value of the 'addon_version' attribute and
+// a flag indicating if the attribute has a value.
+//
+// Link to the installed version of this add-on.
+func (o *AddOnInstallation) GetAddonVersion() (value *AddOnVersion, ok bool) {
+	ok = o != nil && o.bitmap_&16 != 0
+	if ok {
+		value = o.addonVersion
+	}
+	return
+}
+
 // Cluster returns the value of the 'cluster' attribute, or
 // the zero value of the type if the attribute doesn't have a value.
 //
 // ID used to identify the cluster that this add-on is attached to.
 func (o *AddOnInstallation) Cluster() *Cluster {
-	if o != nil && o.bitmap_&16 != 0 {
+	if o != nil && o.bitmap_&32 != 0 {
 		return o.cluster
 	}
 	return nil
@@ -149,7 +172,7 @@ func (o *AddOnInstallation) Cluster() *Cluster {
 //
 // ID used to identify the cluster that this add-on is attached to.
 func (o *AddOnInstallation) GetCluster() (value *Cluster, ok bool) {
-	ok = o != nil && o.bitmap_&16 != 0
+	ok = o != nil && o.bitmap_&32 != 0
 	if ok {
 		value = o.cluster
 	}
@@ -161,7 +184,7 @@ func (o *AddOnInstallation) GetCluster() (value *Cluster, ok bool) {
 //
 // Date and time when the add-on was initially installed in the cluster.
 func (o *AddOnInstallation) CreationTimestamp() time.Time {
-	if o != nil && o.bitmap_&32 != 0 {
+	if o != nil && o.bitmap_&64 != 0 {
 		return o.creationTimestamp
 	}
 	return time.Time{}
@@ -172,7 +195,7 @@ func (o *AddOnInstallation) CreationTimestamp() time.Time {
 //
 // Date and time when the add-on was initially installed in the cluster.
 func (o *AddOnInstallation) GetCreationTimestamp() (value time.Time, ok bool) {
-	ok = o != nil && o.bitmap_&32 != 0
+	ok = o != nil && o.bitmap_&64 != 0
 	if ok {
 		value = o.creationTimestamp
 	}
@@ -184,7 +207,7 @@ func (o *AddOnInstallation) GetCreationTimestamp() (value time.Time, ok bool) {
 //
 // Version of the operator installed by the add-on.
 func (o *AddOnInstallation) OperatorVersion() string {
-	if o != nil && o.bitmap_&64 != 0 {
+	if o != nil && o.bitmap_&128 != 0 {
 		return o.operatorVersion
 	}
 	return ""
@@ -195,7 +218,7 @@ func (o *AddOnInstallation) OperatorVersion() string {
 //
 // Version of the operator installed by the add-on.
 func (o *AddOnInstallation) GetOperatorVersion() (value string, ok bool) {
-	ok = o != nil && o.bitmap_&64 != 0
+	ok = o != nil && o.bitmap_&128 != 0
 	if ok {
 		value = o.operatorVersion
 	}
@@ -207,7 +230,7 @@ func (o *AddOnInstallation) GetOperatorVersion() (value string, ok bool) {
 //
 // List of add-on parameters for this add-on installation.
 func (o *AddOnInstallation) Parameters() *AddOnInstallationParameterList {
-	if o != nil && o.bitmap_&128 != 0 {
+	if o != nil && o.bitmap_&256 != 0 {
 		return o.parameters
 	}
 	return nil
@@ -218,7 +241,7 @@ func (o *AddOnInstallation) Parameters() *AddOnInstallationParameterList {
 //
 // List of add-on parameters for this add-on installation.
 func (o *AddOnInstallation) GetParameters() (value *AddOnInstallationParameterList, ok bool) {
-	ok = o != nil && o.bitmap_&128 != 0
+	ok = o != nil && o.bitmap_&256 != 0
 	if ok {
 		value = o.parameters
 	}
@@ -230,7 +253,7 @@ func (o *AddOnInstallation) GetParameters() (value *AddOnInstallationParameterLi
 //
 // Overall state of the add-on installation.
 func (o *AddOnInstallation) State() AddOnInstallationState {
-	if o != nil && o.bitmap_&256 != 0 {
+	if o != nil && o.bitmap_&512 != 0 {
 		return o.state
 	}
 	return AddOnInstallationState("")
@@ -241,7 +264,7 @@ func (o *AddOnInstallation) State() AddOnInstallationState {
 //
 // Overall state of the add-on installation.
 func (o *AddOnInstallation) GetState() (value AddOnInstallationState, ok bool) {
-	ok = o != nil && o.bitmap_&256 != 0
+	ok = o != nil && o.bitmap_&512 != 0
 	if ok {
 		value = o.state
 	}
@@ -253,7 +276,7 @@ func (o *AddOnInstallation) GetState() (value AddOnInstallationState, ok bool) {
 //
 // Reason for the current State.
 func (o *AddOnInstallation) StateDescription() string {
-	if o != nil && o.bitmap_&512 != 0 {
+	if o != nil && o.bitmap_&1024 != 0 {
 		return o.stateDescription
 	}
 	return ""
@@ -264,7 +287,7 @@ func (o *AddOnInstallation) StateDescription() string {
 //
 // Reason for the current State.
 func (o *AddOnInstallation) GetStateDescription() (value string, ok bool) {
-	ok = o != nil && o.bitmap_&512 != 0
+	ok = o != nil && o.bitmap_&1024 != 0
 	if ok {
 		value = o.stateDescription
 	}
@@ -276,7 +299,7 @@ func (o *AddOnInstallation) GetStateDescription() (value string, ok bool) {
 //
 // Date and time when the add-on installation information was last updated.
 func (o *AddOnInstallation) UpdatedTimestamp() time.Time {
-	if o != nil && o.bitmap_&1024 != 0 {
+	if o != nil && o.bitmap_&2048 != 0 {
 		return o.updatedTimestamp
 	}
 	return time.Time{}
@@ -287,32 +310,9 @@ func (o *AddOnInstallation) UpdatedTimestamp() time.Time {
 //
 // Date and time when the add-on installation information was last updated.
 func (o *AddOnInstallation) GetUpdatedTimestamp() (value time.Time, ok bool) {
-	ok = o != nil && o.bitmap_&1024 != 0
-	if ok {
-		value = o.updatedTimestamp
-	}
-	return
-}
-
-// Version returns the value of the 'version' attribute, or
-// the zero value of the type if the attribute doesn't have a value.
-//
-// Link to the installed version of this add-on.
-func (o *AddOnInstallation) Version() *AddOnVersion {
-	if o != nil && o.bitmap_&2048 != 0 {
-		return o.version
-	}
-	return nil
-}
-
-// GetVersion returns the value of the 'version' attribute and
-// a flag indicating if the attribute has a value.
-//
-// Link to the installed version of this add-on.
-func (o *AddOnInstallation) GetVersion() (value *AddOnVersion, ok bool) {
 	ok = o != nil && o.bitmap_&2048 != 0
 	if ok {
-		value = o.version
+		value = o.updatedTimestamp
 	}
 	return
 }