Merge pull request #881 from davidleerh/OCM-5312-SDK

OCM-5312 | Add Platform to subnet_network_verification_type

CHANGES.md

@@ -3,6 +3,10 @@
 This document describes the relevant changes between releases of the OCM API
 SDK.
 
+## 0.1.390
+- Update model version v0.0.343
+  -  Add `Platform`to `subnet_network_verification_type` resource
+
 ## 0.1.389
 - Update model version v0.0.342
   -  Add `Search` and `Order` methods to List `/api/clusters_mgmt/v1/clusters/{id}/node_pools`

Makefile

@@ -27,7 +27,7 @@ export PATH := $(LOCAL_BIN_PATH):$(PATH)
 export CGO_ENABLED=0
 
 # Details of the model to use:
-model_version:=v0.0.342
+model_version:=v0.0.343
 model_url:=https://github.com/openshift-online/ocm-api-model.git
 
 # Details of the metamodel to use:

clustersmgmt/v1/platform_type.go

@@ -26,6 +26,10 @@ const (
 	//
 	PlatformAws Platform = "aws"
 	//
+	PlatformAwsClassic Platform = "aws-classic"
+	//
+	PlatformAwsHostedCp Platform = "aws-hosted-cp"
+	//
 	PlatformGcp Platform = "gcp"
 	//
 	PlatformHostedCluster Platform = "hostedcluster"

clustersmgmt/v1/subnet_network_verification_builder.go

@@ -21,12 +21,13 @@ package v1 // github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1
 
 // SubnetNetworkVerificationBuilder contains the data and logic needed to build 'subnet_network_verification' objects.
 type SubnetNetworkVerificationBuilder struct {
-	bitmap_ uint32
-	id      string
-	href    string
-	details []string
-	state   string
-	tags    map[string]string
+	bitmap_  uint32
+	id       string
+	href     string
+	details  []string
+	platform Platform
+	state    string
+	tags     map[string]string
 }
 
 // NewSubnetNetworkVerification creates a new builder of 'subnet_network_verification' objects.
@@ -67,20 +68,29 @@ func (b *SubnetNetworkVerificationBuilder) Details(values ...string) *SubnetNetw
 	return b
 }
 
+// Platform sets the value of the 'platform' attribute to the given value.
+//
+// Representation of an platform type field.
+func (b *SubnetNetworkVerificationBuilder) Platform(value Platform) *SubnetNetworkVerificationBuilder {
+	b.platform = value
+	b.bitmap_ |= 16
+	return b
+}
+
 // State sets the value of the 'state' attribute to the given value.
 func (b *SubnetNetworkVerificationBuilder) State(value string) *SubnetNetworkVerificationBuilder {
 	b.state = value
-	b.bitmap_ |= 16
+	b.bitmap_ |= 32
 	return b
 }
 
 // Tags sets the value of the 'tags' attribute to the given value.
 func (b *SubnetNetworkVerificationBuilder) Tags(value map[string]string) *SubnetNetworkVerificationBuilder {
 	b.tags = value
 	if value != nil {
-		b.bitmap_ |= 32
+		b.bitmap_ |= 64
 	} else {
-		b.bitmap_ &^= 32
+		b.bitmap_ &^= 64
 	}
 	return b
 }
@@ -99,6 +109,7 @@ func (b *SubnetNetworkVerificationBuilder) Copy(object *SubnetNetworkVerificatio
 	} else {
 		b.details = nil
 	}
+	b.platform = object.platform
 	b.state = object.state
 	if len(object.tags) > 0 {
 		b.tags = map[string]string{}
@@ -121,6 +132,7 @@ func (b *SubnetNetworkVerificationBuilder) Build() (object *SubnetNetworkVerific
 		object.details = make([]string, len(b.details))
 		copy(object.details, b.details)
 	}
+	object.platform = b.platform
 	object.state = b.state
 	if b.tags != nil {
 		object.tags = make(map[string]string)

clustersmgmt/v1/subnet_network_verification_type.go

@@ -33,12 +33,13 @@ const SubnetNetworkVerificationNilKind = "SubnetNetworkVerificationNil"
 
 // SubnetNetworkVerification represents the values of the 'subnet_network_verification' type.
 type SubnetNetworkVerification struct {
-	bitmap_ uint32
-	id      string
-	href    string
-	details []string
-	state   string
-	tags    map[string]string
+	bitmap_  uint32
+	id       string
+	href     string
+	details  []string
+	platform Platform
+	state    string
+	tags     map[string]string
 }
 
 // Kind returns the name of the type of the object.
@@ -121,12 +122,35 @@ func (o *SubnetNetworkVerification) GetDetails() (value []string, ok bool) {
 	return
 }
 
+// Platform returns the value of the 'platform' attribute, or
+// the zero value of the type if the attribute doesn't have a value.
+//
+// Platform supplied to the network verifier for this subnet.
+func (o *SubnetNetworkVerification) Platform() Platform {
+	if o != nil && o.bitmap_&16 != 0 {
+		return o.platform
+	}
+	return Platform("")
+}
+
+// GetPlatform returns the value of the 'platform' attribute and
+// a flag indicating if the attribute has a value.
+//
+// Platform supplied to the network verifier for this subnet.
+func (o *SubnetNetworkVerification) GetPlatform() (value Platform, ok bool) {
+	ok = o != nil && o.bitmap_&16 != 0
+	if ok {
+		value = o.platform
+	}
+	return
+}
+
 // State returns the value of the 'state' attribute, or
 // the zero value of the type if the attribute doesn't have a value.
 //
 // State of the subnet network verification.
 func (o *SubnetNetworkVerification) State() string {
-	if o != nil && o.bitmap_&16 != 0 {
+	if o != nil && o.bitmap_&32 != 0 {
 		return o.state
 	}
 	return ""
@@ -137,7 +161,7 @@ func (o *SubnetNetworkVerification) State() string {
 //
 // State of the subnet network verification.
 func (o *SubnetNetworkVerification) GetState() (value string, ok bool) {
-	ok = o != nil && o.bitmap_&16 != 0
+	ok = o != nil && o.bitmap_&32 != 0
 	if ok {
 		value = o.state
 	}
@@ -149,7 +173,7 @@ func (o *SubnetNetworkVerification) GetState() (value string, ok bool) {
 //
 // Tags supplied to the network verifier for this subnet.
 func (o *SubnetNetworkVerification) Tags() map[string]string {
-	if o != nil && o.bitmap_&32 != 0 {
+	if o != nil && o.bitmap_&64 != 0 {
 		return o.tags
 	}
 	return nil
@@ -160,7 +184,7 @@ func (o *SubnetNetworkVerification) Tags() map[string]string {
 //
 // Tags supplied to the network verifier for this subnet.
 func (o *SubnetNetworkVerification) GetTags() (value map[string]string, ok bool) {
-	ok = o != nil && o.bitmap_&32 != 0
+	ok = o != nil && o.bitmap_&64 != 0
 	if ok {
 		value = o.tags
 	}

clustersmgmt/v1/subnet_network_verification_type_json.go

@@ -76,6 +76,15 @@ func writeSubnetNetworkVerification(object *SubnetNetworkVerification, stream *j
 		count++
 	}
 	present_ = object.bitmap_&16 != 0
+	if present_ {
+		if count > 0 {
+			stream.WriteMore()
+		}
+		stream.WriteObjectField("platform")
+		stream.WriteString(string(object.platform))
+		count++
+	}
+	present_ = object.bitmap_&32 != 0
 	if present_ {
 		if count > 0 {
 			stream.WriteMore()
@@ -84,7 +93,7 @@ func writeSubnetNetworkVerification(object *SubnetNetworkVerification, stream *j
 		stream.WriteString(object.state)
 		count++
 	}
-	present_ = object.bitmap_&32 != 0 && object.tags != nil
+	present_ = object.bitmap_&64 != 0 && object.tags != nil
 	if present_ {
 		if count > 0 {
 			stream.WriteMore()
@@ -151,10 +160,15 @@ func readSubnetNetworkVerification(iterator *jsoniter.Iterator) *SubnetNetworkVe
 			value := readStringList(iterator)
 			object.details = value
 			object.bitmap_ |= 8
+		case "platform":
+			text := iterator.ReadString()
+			value := Platform(text)
+			object.platform = value
+			object.bitmap_ |= 16
 		case "state":
 			value := iterator.ReadString()
 			object.state = value
-			object.bitmap_ |= 16
+			object.bitmap_ |= 32
 		case "tags":
 			value := map[string]string{}
 			for {
@@ -166,7 +180,7 @@ func readSubnetNetworkVerification(iterator *jsoniter.Iterator) *SubnetNetworkVe
 				value[key] = item
 			}
 			object.tags = value
-			object.bitmap_ |= 32
+			object.bitmap_ |= 64
 		default:
 			iterator.ReadAny()
 		}

openapi/clusters_mgmt/v1/openapi.json

@@ -15892,6 +15892,8 @@
         "type": "string",
         "enum": [
           "aws",
+          "aws-classic",
+          "aws-hosted-cp",
           "gcp",
           "hostedcluster"
         ]
@@ -16274,6 +16276,10 @@
               "type": "string"
             }
           },
+          "platform": {
+            "description": "Platform supplied to the network verifier for this subnet.",
+            "$ref": "#/components/schemas/Platform"
+          },
           "state": {
             "description": "State of the subnet network verification.",
             "type": "string"

version.go

@@ -18,4 +18,4 @@ limitations under the License.
 
 package sdk
 
-const Version = "0.1.389"
+const Version = "0.1.390"