From b63b5ce9d77eb802de2f06cfba85292936fb943c Mon Sep 17 00:00:00 2001 From: Chris Couzens Date: Thu, 16 Jul 2020 13:44:42 +0100 Subject: [PATCH] Remove fields marked as removed I'm not sure why they're kept in the documentation --- transformer/src/parsers/doc/etc/annotation.rs | 112 +++++++++++-- transformer/src/parsers/doc/etc/field.rs | 5 + .../src/parsers/doc/etc/object_type.rs | 56 +++++++ website/27.0.json | 32 ---- website/29.0.json | 32 ---- website/30.0.json | 78 --------- website/31.0.json | 133 --------------- website/32.0.json | 133 --------------- website/33.0.json | 153 ------------------ website/34.0.json | 153 ------------------ 10 files changed, 158 insertions(+), 729 deletions(-) diff --git a/transformer/src/parsers/doc/etc/annotation.rs b/transformer/src/parsers/doc/etc/annotation.rs index 76831a7..1947ab4 100644 --- a/transformer/src/parsers/doc/etc/annotation.rs +++ b/transformer/src/parsers/doc/etc/annotation.rs @@ -17,6 +17,7 @@ pub(super) struct Annotation { pub(super) deprecated: bool, pub(super) modifiable: Option, pub(super) content_type: Option, + pub(super) removed: bool, } #[derive(Error, Debug, PartialEq)] @@ -33,6 +34,7 @@ impl Annotation { deprecated: self.deprecated || b.deprecated, modifiable: self.modifiable.or(b.modifiable), required: self.required.or(b.required), + removed: self.removed || b.removed, } } } @@ -95,14 +97,30 @@ impl TryFrom<&Vec> for Annotation { name, attributes, .. - }) if namespace == XML_SCHEMA_NS - && name == "documentation" - && attributes.get("source").map(String::as_str) == Some("deprecated") => - { - true + }) => { + namespace == XML_SCHEMA_NS + && name == "documentation" + && attributes.get("source").map(String::as_str) == Some("deprecated") + } + _ => false, + }); + let removed = children.iter().any(|child| match child { + xmltree::XMLNode::Element(xmltree::Element { + namespace: Some(namespace), + name, + attributes, + .. + }) => { + (namespace == XML_SCHEMA_NS + && name == "documentation" + && attributes.get("source").map(String::as_str) == Some("removed-in")) + || (namespace == "http://www.vmware.com/vcloud/meta" + && name == "version" + && attributes.contains_key("removed-in")) } _ => false, }); + let modifiable = children .iter() .filter_map(|child| match child { @@ -166,6 +184,7 @@ impl TryFrom<&Vec> for Annotation { deprecated, modifiable, content_type, + removed, }) } } @@ -227,7 +246,8 @@ fn test_parse_annotation() { required: None, deprecated: false, modifiable: None, - content_type: None + content_type: None, + removed: false }) ); } @@ -251,7 +271,8 @@ fn test_parse_annotation_required() { required: Some(true), deprecated: false, modifiable: None, - content_type: None + content_type: None, + removed: false }) ); } @@ -277,7 +298,8 @@ fn test_parse_annotation_not_required() { required: Some(false), deprecated: false, modifiable: None, - content_type: None + content_type: None, + removed: false }) ); } @@ -300,7 +322,8 @@ fn test_parse_annotation_deprecated() { required: None, deprecated: true, modifiable: None, - content_type: None + content_type: None, + removed: false }) ); } @@ -325,7 +348,8 @@ fn test_parse_annotation_modifiable_create() { required: None, deprecated: false, modifiable: Some(Modifiable::Create), - content_type: None + content_type: None, + removed: false }) ); } @@ -348,7 +372,8 @@ fn test_parse_annotation_modifiable_update() { required: None, deprecated: false, modifiable: Some(Modifiable::Update), - content_type: None + content_type: None, + removed: false }) ); } @@ -371,7 +396,8 @@ fn test_parse_annotation_modifiable_always() { required: None, deprecated: false, modifiable: Some(Modifiable::Always), - content_type: None + content_type: None, + removed: false }) ); } @@ -394,7 +420,8 @@ fn test_parse_annotation_modifiable_none() { required: None, deprecated: false, modifiable: Some(Modifiable::None), - content_type: None + content_type: None, + removed: false }) ); } @@ -421,7 +448,8 @@ fn test_parse_content_type() { required: None, deprecated: false, modifiable: None, - content_type: Some("application/vnd.ccouzens.test".to_owned()) + content_type: Some("application/vnd.ccouzens.test".to_owned()), + removed: false }) ); } @@ -447,7 +475,61 @@ fn test_parse_annotation_inside_app_info() { required: None, deprecated: false, modifiable: None, - content_type: None + content_type: None, + removed: false + }) + ); +} + +#[test] +fn test_annotation_indicating_removal() { + let xml: &[u8] = br#" + + + always + + This field has been removed + + false + 6.0 + API_VERSION_POST9_1_UPDATE + "#; + let tree = xmltree::Element::parse(xml).unwrap(); + assert_eq!( + Annotation::try_from(&xmltree::XMLNode::Element(tree)), + Ok(Annotation { + description: Some("This field has been removed".to_owned()), + required: Some(false), + deprecated: true, + modifiable: Some(Modifiable::Always), + content_type: None, + removed: true + }) + ); +} + +#[test] +fn test_alternative_removal_syntax() { + let xml: &[u8] = br#" + + + always + + This field has been removed + + false + 6.0 + "#; + let tree = xmltree::Element::parse(xml).unwrap(); + assert_eq!( + Annotation::try_from(&xmltree::XMLNode::Element(tree)), + Ok(Annotation { + description: Some("This field has been removed".to_owned()), + required: Some(false), + deprecated: true, + modifiable: Some(Modifiable::Always), + content_type: None, + removed: true }) ); } diff --git a/transformer/src/parsers/doc/etc/field.rs b/transformer/src/parsers/doc/etc/field.rs index a551077..9b3c520 100644 --- a/transformer/src/parsers/doc/etc/field.rs +++ b/transformer/src/parsers/doc/etc/field.rs @@ -32,6 +32,8 @@ pub enum FieldParseError { MissingType, #[error("not a sequence element node")] NotFieldNode, + #[error("this field is marked as removed")] + Removed, } impl TryFrom<(&xmltree::XMLNode, &str)> for Field { @@ -83,6 +85,9 @@ impl TryFrom<(&xmltree::XMLNode, &str)> for Field { _ => Occurrences::One, }; let annotation = children.iter().flat_map(Annotation::try_from).next(); + if annotation.as_ref().map(|a| a.removed) == Some(true) { + return Err(FieldParseError::Removed); + } Ok(Field { annotation, name, diff --git a/transformer/src/parsers/doc/etc/object_type.rs b/transformer/src/parsers/doc/etc/object_type.rs index 17f0f4d..ed172cd 100644 --- a/transformer/src/parsers/doc/etc/object_type.rs +++ b/transformer/src/parsers/doc/etc/object_type.rs @@ -151,6 +151,7 @@ impl TryFrom<(&xmltree::XMLNode, &str)> for ObjectType { description: None, modifiable: None, required: Some(true), + removed: false, }), name: "value".into(), occurrences: Occurrences::One, @@ -425,3 +426,58 @@ fn parse_annotation_inside_complex_content_test() { }) ); } + +#[test] +fn removed_field_test() { + let xml: &[u8] = br#" + + + 0.9 + + A base abstract type for all the types. + + + + + + + + always + + A field that has been removed + + false + + + + + always + + A field that has not been removed + + false + + + + + + "#; + let tree = xmltree::Element::parse(xml).unwrap(); + let c = Type::try_from((&xmltree::XMLNode::Element(tree), "test")).unwrap(); + let value = openapiv3::Schema::from(&c); + assert_eq!( + serde_json::to_value(value).unwrap(), + json!({ + "title": "test_BaseType", + "description": "A base abstract type for all the types.", + "type": "object", + "properties": { + "fieldB": { + "description": "A field that has not been removed", + "type": "string" + } + }, + "additionalProperties": false + }) + ); +} diff --git a/website/27.0.json b/website/27.0.json index 2c31f76..e40dc96 100644 --- a/website/27.0.json +++ b/website/27.0.json @@ -19972,15 +19972,6 @@ } ] }, - "storageCapacity": { - "readOnly": true, - "description": "Read\\-only indicator of datastore capacity.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ProviderVdcCapacityType" - } - ] - }, "availableNetworks": { "readOnly": true, "description": "Read\\-only list of available networks.", @@ -28872,9 +28863,6 @@ "description": "An arbitrary key name. Length cannot exceed 256 UTF\\-8 characters.", "type": "string" }, - "value": { - "type": "string" - }, "typedValue": { "description": "One of: \n MetadataStringValue \n MetadataNumberValue \n MetadataBooleanValue \n MetadataDateTimeValue", "allOf": [ @@ -29024,9 +29012,6 @@ } ] }, - "value": { - "type": "string" - }, "typedValue": { "allOf": [ { @@ -31743,15 +31728,6 @@ "description": "Compatibility mode. Default is false. If set to true, will allow users to write firewall rules in the old 1.5 format. The new format does not require to use direction in firewall rules. Also, for firewall rules to allow NAT traffic the filter is applied on the original IP addresses. Once set to true cannot be reverted back to false.", "type": "boolean" }, - "ipScope": { - "deprecated": true, - "description": "Includes IP level configuration items such as gateway, dns, subnet, IP address pool to be used for allocation. Note that the pool of IP addresses needs to fall within the subnet/mask of the IpScope.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_IpScopeType" - } - ] - }, "ipScopes": { "description": "A list of IP scopes for the network.", "allOf": [ @@ -40328,14 +40304,6 @@ "description": "The allocation model used by this vDC. One of: \n**AllocationVApp** (Pay as you go. Resources are committed to a vDC only when vApps are created in it. When you use this allocation model, any Limit values you specify for Memory and CPU are ignored on create and returned as 0 on retrieve.) \n**AllocationPool** (Only a percentage of the resources you allocate are committed to the organization vDC.) \n**ReservationPool** (All the resources you allocate are committed as a pool to the organization vDC. vApps in vDCs that support this allocation model can specify values for resource and limit.)", "type": "string" }, - "storageCapacity": { - "description": "The storage capacity allocated to this vDC.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_CapacityWithUsageType" - } - ] - }, "computeCapacity": { "description": "The compute capacity allocated to this vDC.", "allOf": [ diff --git a/website/29.0.json b/website/29.0.json index ea3e1f5..2738a77 100644 --- a/website/29.0.json +++ b/website/29.0.json @@ -20917,15 +20917,6 @@ } ] }, - "storageCapacity": { - "readOnly": true, - "description": "Read\\-only indicator of datastore capacity.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ProviderVdcCapacityType" - } - ] - }, "availableNetworks": { "readOnly": true, "description": "Read\\-only list of available networks.", @@ -29835,9 +29826,6 @@ "description": "An arbitrary key name. Length cannot exceed 256 UTF\\-8 characters.", "type": "string" }, - "value": { - "type": "string" - }, "typedValue": { "description": "One of: \n MetadataStringValue \n MetadataNumberValue \n MetadataBooleanValue \n MetadataDateTimeValue", "allOf": [ @@ -29987,9 +29975,6 @@ } ] }, - "value": { - "type": "string" - }, "typedValue": { "allOf": [ { @@ -32975,15 +32960,6 @@ "description": "Compatibility mode. Default is false. If set to true, will allow users to write firewall rules in the old 1.5 format. The new format does not require to use direction in firewall rules. Also, for firewall rules to allow NAT traffic the filter is applied on the original IP addresses. Once set to true cannot be reverted back to false.", "type": "boolean" }, - "ipScope": { - "deprecated": true, - "description": "Includes IP level configuration items such as gateway, dns, subnet, IP address pool to be used for allocation. Note that the pool of IP addresses needs to fall within the subnet/mask of the IpScope.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_IpScopeType" - } - ] - }, "ipScopes": { "description": "A list of IP scopes for the network.", "allOf": [ @@ -42188,14 +42164,6 @@ "description": "The allocation model used by this vDC. One of: \n**AllocationVApp** (Pay as you go. Resources are committed to a vDC only when vApps are created in it. When you use this allocation model, any Limit values you specify for Memory and CPU are ignored on create and returned as 0 on retrieve.) \n**AllocationPool** (Only a percentage of the resources you allocate are committed to the organization vDC.) \n**ReservationPool** (All the resources you allocate are committed as a pool to the organization vDC. vApps in vDCs that support this allocation model can specify values for resource and limit.)", "type": "string" }, - "storageCapacity": { - "description": "The storage capacity allocated to this vDC.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_CapacityWithUsageType" - } - ] - }, "computeCapacity": { "description": "The compute capacity allocated to this vDC.", "allOf": [ diff --git a/website/30.0.json b/website/30.0.json index 42d4955..ff4c847 100644 --- a/website/30.0.json +++ b/website/30.0.json @@ -21013,15 +21013,6 @@ } ] }, - "storageCapacity": { - "readOnly": true, - "description": "Read\\-only indicator of datastore capacity.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ProviderVdcCapacityType" - } - ] - }, "availableNetworks": { "readOnly": true, "description": "Read\\-only list of available networks.", @@ -24790,16 +24781,6 @@ "description": "True to allow creation of multiple external networks on the same LAN segment.", "type": "boolean" }, - "chargebackEventsKeepDays": { - "description": "Days for which events are to be kept in Chargeback Tables.", - "type": "integer", - "format": "int32" - }, - "chargebackTablesCleanupJobTimeInSeconds": { - "description": "Time of the day at which the chargeback tables cleanup job should run.", - "type": "integer", - "format": "int32" - }, "consoleProxyExternalAddress": { "description": "Use this address to access the console proxy from the public side of a firewall or load\\-balancer. \n Leave empty to clear the address.", "type": "string" @@ -24983,8 +24964,6 @@ "activityLogDisplayDays", "activityLogKeepDays", "allowOverlappingExtNets", - "chargebackEventsKeepDays", - "chargebackTablesCleanupJobTimeInSeconds", "hostCheckDelayInSeconds", "hostCheckTimeoutSeconds", "ipReservationTimeoutSeconds", @@ -25443,10 +25422,6 @@ "description": "Allows setting a login page custom theme. See the online help for more information.", "type": "string" }, - "theme": { - "description": "Deprecated. Use PreviewCustomTheme and FinalCustomTheme instead.", - "type": "string" - }, "previewCustomTheme": { "description": "Allows setting a custom theme. See the online help for more information.", "type": "string" @@ -28922,13 +28897,6 @@ } ] }, - "property": { - "description": "User\\-specified key/value pair. This element has been superseded by the Metadata element, which is the preferred way to specify key/value pairs for objects.", - "type": "array", - "items": { - "$ref": "#/components/schemas/vcloud_PropertyType" - } - }, "dateCreated": { "readOnly": true, "description": "Creation date and time of the catalog item.", @@ -29363,12 +29331,6 @@ "description": "Capacity used. If the VDC AllocationModel is ReservationPool, this number represents the percentage of the reservation that is in use. For all other allocation models, it represents the percentage of the allocation that is in use.", "type": "integer", "format": "int64" - }, - "overhead": { - "readOnly": true, - "description": "Number of Units allocated to system resources such as vShield Manager virtual machines and shadow virtual machines provisioned from this Provider vDC.", - "type": "integer", - "format": "int64" } }, "additionalProperties": false @@ -29581,9 +29543,6 @@ "description": "An arbitrary key name. Length cannot exceed 256 UTF\\-8 characters.", "type": "string" }, - "value": { - "type": "string" - }, "typedValue": { "description": "One of: \n MetadataStringValue \n MetadataNumberValue \n MetadataBooleanValue \n MetadataDateTimeValue", "allOf": [ @@ -29733,9 +29692,6 @@ } ] }, - "value": { - "type": "string" - }, "typedValue": { "allOf": [ { @@ -31825,10 +31781,6 @@ "description": "Used to enable or disable the firewall rule. Default value is true.", "type": "boolean" }, - "matchOnTranslate": { - "description": "For DNATed traffic, match the firewall rules only after the destination IP is translated.", - "type": "boolean" - }, "description": { "description": "A description of the rule.", "type": "string" @@ -31841,28 +31793,14 @@ "description": "ICMP subtype. One of: address\\-mask\\-request, address\\-mask\\-reply, destination\\-unreachable, echo\\-request, echo\\-reply, parameter\\-problem, redirect, router\\-advertisement, router\\-solicitation, source\\-quench, time\\-exceeded, timestamp\\-request, timestamp\\-reply, any.", "type": "string" }, - "port": { - "description": "The port to which this rule applies. A value of \\-1 matches any port.", - "type": "integer", - "format": "int32" - }, "destinationPortRange": { "description": "Destination port range to which this rule applies.", "type": "string" }, - "sourcePort": { - "description": "Destination port to which this rule applies. A value of \\-1 matches any port.", - "type": "integer", - "format": "int32" - }, "sourcePortRange": { "description": "Source port range to which this rule applies.", "type": "string" }, - "direction": { - "description": "Direction of traffic to which rule applies. One of: in (rule applies to incoming traffic. This is the default value), out (rule applies to outgoing traffic).", - "type": "string" - }, "enableLogging": { "description": "Used to enable or disable firewall rule logging. Default value is false.", "type": "boolean" @@ -32848,14 +32786,6 @@ "description": "Compatibility mode. Default is false. If set to true, will allow users to write firewall rules in the old 1.5 format. The new format does not require to use direction in firewall rules. Also, for firewall rules to allow NAT traffic the filter is applied on the original IP addresses. Once set to true cannot be reverted back to false.", "type": "boolean" }, - "ipScope": { - "description": "Includes IP level configuration items such as gateway, dns, subnet, IP address pool to be used for allocation. Note that the pool of IP addresses needs to fall within the subnet/mask of the IpScope.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_IpScopeType" - } - ] - }, "ipScopes": { "description": "A list of IP scopes for the network.", "allOf": [ @@ -42097,14 +42027,6 @@ "description": "The allocation model used by this vDC. One of: \n**AllocationVApp** (Pay as you go. Resources are committed to a vDC only when vApps are created in it. When you use this allocation model, any Limit values you specify for Memory and CPU are ignored on create and returned as 0 on retrieve.) \n**AllocationPool** (Only a percentage of the resources you allocate are committed to the organization vDC.) \n**ReservationPool** (All the resources you allocate are committed as a pool to the organization vDC. vApps in vDCs that support this allocation model can specify values for resource and limit.)", "type": "string" }, - "storageCapacity": { - "description": "The storage capacity allocated to this vDC.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_CapacityWithUsageType" - } - ] - }, "computeCapacity": { "description": "The compute capacity allocated to this vDC.", "allOf": [ diff --git a/website/31.0.json b/website/31.0.json index 79d3b96..8c6ff83 100644 --- a/website/31.0.json +++ b/website/31.0.json @@ -21539,15 +21539,6 @@ } ] }, - "storageCapacity": { - "readOnly": true, - "description": "Read\\-only indicator of datastore capacity.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ProviderVdcCapacityType" - } - ] - }, "availableNetworks": { "readOnly": true, "description": "Read\\-only list of available networks.", @@ -22440,21 +22431,6 @@ "description": "User name as retrieved from, and in the encoding used by, the specified identity provider.", "type": "string" }, - "isAlertEnabled": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if alerts are enabled for the user.)", - "type": "boolean" - }, - "alertEmailPrefix": { - "deprecated": true, - "description": "This field is unused and is deprecated. (String to prepend to alert message Subject line.)", - "type": "string" - }, - "alertEmail": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if this user should get alert email.)", - "type": "string" - }, "isExternal": { "description": "On creation, specifies whether this user should be imported from the organization's LDAP service or created locally. Ignored if ProviderType is SAML or OAUTH. On retrieval, indicates whether the user is local or imported.", "type": "boolean" @@ -22463,11 +22439,6 @@ "description": "Identity provider type for this this user. One of: \n**INTEGRATED** (The user is created locally or imported from LDAP.) \n**SAML** (The user is imported from a SAML identity provider.) \n**OAUTH** (The user is imported from an OAUTH identity provider.) \n If missing or empty the default value is **INTEGRATED**.", "type": "string" }, - "isDefaultCached": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if this user is cached by default.)", - "type": "boolean" - }, "isGroupRole": { "description": "True if this user has a group role.", "type": "boolean" @@ -23581,10 +23552,6 @@ "type": "string", "format": "uri" }, - "roleAttributeName": { - "description": "The name of the SAML attribute that returns the identifiers of all roles of the user.", - "type": "string" - }, "samlAttributeMapping": { "readOnly": true, "allOf": [ @@ -25593,16 +25560,6 @@ "description": "True to allow creation of multiple external networks on the same LAN segment.", "type": "boolean" }, - "chargebackEventsKeepDays": { - "description": "Days for which events are to be kept in Chargeback Tables.", - "type": "integer", - "format": "int32" - }, - "chargebackTablesCleanupJobTimeInSeconds": { - "description": "Time of the day at which the chargeback tables cleanup job should run.", - "type": "integer", - "format": "int32" - }, "consoleProxyExternalAddress": { "description": "Use this address to access the console proxy from the public side of a firewall or load\\-balancer. \n Leave empty to clear the address.", "type": "string" @@ -25786,8 +25743,6 @@ "activityLogDisplayDays", "activityLogKeepDays", "allowOverlappingExtNets", - "chargebackEventsKeepDays", - "chargebackTablesCleanupJobTimeInSeconds", "hostCheckDelayInSeconds", "hostCheckTimeoutSeconds", "ipReservationTimeoutSeconds", @@ -26250,10 +26205,6 @@ "description": "Allows setting a login page custom theme. See the online help for more information.", "type": "string" }, - "theme": { - "description": "Deprecated. Use PreviewCustomTheme and FinalCustomTheme instead.", - "type": "string" - }, "previewCustomTheme": { "description": "Allows setting a custom theme. See the online help for more information.", "type": "string" @@ -26486,11 +26437,6 @@ "type": "integer", "format": "int32" }, - "ssl": { - "deprecated": true, - "description": "True if the SMTP server requires an SSL connection.", - "type": "boolean" - }, "smtpSecureMode": { "description": "Security protocol to use when connecting to the SMTP server. One of: \n startTls \\-\\- Use the STARTTLS protocol \n ssl \\-\\- \\-Use the SSL/TLS protocol \n none \\-\\- Do not use any security protocol", "allOf": [ @@ -26618,11 +26564,6 @@ "password": { "description": "The vSphere SSO service password for the user named in userName.", "type": "string" - }, - "vCDUrl": { - "deprecated": true, - "description": "The vCloud Director public login URL. This element is deprecated and should be left empty when using API version 5.6 and later, which obtain this address from SystemSettings:GeneralSettings:SystemExternalAddress.", - "type": "string" } }, "required": [ @@ -29796,13 +29737,6 @@ } ] }, - "property": { - "description": "User\\-specified key/value pair. This element has been superseded by the Metadata element, which is the preferred way to specify key/value pairs for objects.", - "type": "array", - "items": { - "$ref": "#/components/schemas/vcloud_PropertyType" - } - }, "dateCreated": { "readOnly": true, "description": "Creation date and time of the catalog item.", @@ -30237,12 +30171,6 @@ "description": "Capacity used. If the VDC AllocationModel is ReservationPool, this number represents the percentage of the reservation that is in use. For all other allocation models, it represents the percentage of the allocation that is in use.", "type": "integer", "format": "int64" - }, - "overhead": { - "readOnly": true, - "description": "Number of Units allocated to system resources such as vShield Manager virtual machines and shadow virtual machines provisioned from this Provider vDC.", - "type": "integer", - "format": "int64" } }, "additionalProperties": false @@ -30455,9 +30383,6 @@ "description": "An arbitrary key name. Length cannot exceed 256 UTF\\-8 characters.", "type": "string" }, - "value": { - "type": "string" - }, "typedValue": { "description": "One of: \n MetadataStringValue \n MetadataNumberValue \n MetadataBooleanValue \n MetadataDateTimeValue", "allOf": [ @@ -30607,9 +30532,6 @@ } ] }, - "value": { - "type": "string" - }, "typedValue": { "allOf": [ { @@ -32699,10 +32621,6 @@ "description": "Used to enable or disable the firewall rule. Default value is true.", "type": "boolean" }, - "matchOnTranslate": { - "description": "For DNATed traffic, match the firewall rules only after the destination IP is translated.", - "type": "boolean" - }, "description": { "description": "A description of the rule.", "type": "string" @@ -32715,28 +32633,14 @@ "description": "ICMP subtype. One of: address\\-mask\\-request, address\\-mask\\-reply, destination\\-unreachable, echo\\-request, echo\\-reply, parameter\\-problem, redirect, router\\-advertisement, router\\-solicitation, source\\-quench, time\\-exceeded, timestamp\\-request, timestamp\\-reply, any.", "type": "string" }, - "port": { - "description": "The port to which this rule applies. A value of \\-1 matches any port.", - "type": "integer", - "format": "int32" - }, "destinationPortRange": { "description": "Destination port range to which this rule applies.", "type": "string" }, - "sourcePort": { - "description": "Destination port to which this rule applies. A value of \\-1 matches any port.", - "type": "integer", - "format": "int32" - }, "sourcePortRange": { "description": "Source port range to which this rule applies.", "type": "string" }, - "direction": { - "description": "Direction of traffic to which rule applies. One of: in (rule applies to incoming traffic. This is the default value), out (rule applies to outgoing traffic).", - "type": "string" - }, "enableLogging": { "description": "Used to enable or disable firewall rule logging. Default value is false.", "type": "boolean" @@ -33722,14 +33626,6 @@ "description": "Compatibility mode. Default is false. If set to true, will allow users to write firewall rules in the old 1.5 format. The new format does not require to use direction in firewall rules. Also, for firewall rules to allow NAT traffic the filter is applied on the original IP addresses. Once set to true cannot be reverted back to false.", "type": "boolean" }, - "ipScope": { - "description": "Includes IP level configuration items such as gateway, dns, subnet, IP address pool to be used for allocation. Note that the pool of IP addresses needs to fall within the subnet/mask of the IpScope.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_IpScopeType" - } - ] - }, "ipScopes": { "description": "A list of IP scopes for the network.", "allOf": [ @@ -33780,10 +33676,6 @@ } ] }, - "advancedNetworkingEnabled": { - "description": "True if Advanced Networking has been enabled.", - "type": "boolean" - }, "subInterface": { "description": "True if Network is connected to an Edge Gateway subinterface.", "type": "boolean" @@ -42488,14 +42380,6 @@ "description": "Set to true to delete the source object after the operation completes.", "type": "boolean" }, - "sourcedVmInstantiationParams": { - "deprecated": true, - "description": "Represents virtual machine instantiation parameters.", - "type": "array", - "items": { - "$ref": "#/components/schemas/vcloud_SourcedVmInstantiationParamsType" - } - }, "sourcedItem": { "description": "Represents VM instantiation parameters. If this section is present, then SourcedVmInstantiationParamsType section (if present) will be ignored.", "type": "array", @@ -42777,15 +42661,6 @@ "$ref": "#/components/schemas/vcloud_CaptureVmParamsType" } }, - "vdcStorageProfile": { - "deprecated": true, - "description": "A reference to the storage profile to be specified in the vApp template created by this capture. Ignored by vCloud Director 5.5 and later.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ReferenceType" - } - ] - }, "targetCatalogItem": { "description": "To overwrite an existing vApp template with the one created by this capture, place a reference to the existing template here. Otherwise, the operation creates a new vApp template.", "allOf": [ @@ -43315,14 +43190,6 @@ "description": "The allocation model used by this vDC. One of: \n**AllocationVApp** (Pay as you go. Resources are committed to a vDC only when vApps are created in it. When you use this allocation model, any Limit values you specify for Memory and CPU are ignored on create and returned as 0 on retrieve.) \n**AllocationPool** (Only a percentage of the resources you allocate are committed to the organization vDC.) \n**ReservationPool** (All the resources you allocate are committed as a pool to the organization vDC. vApps in vDCs that support this allocation model can specify values for resource and limit.)", "type": "string" }, - "storageCapacity": { - "description": "The storage capacity allocated to this vDC.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_CapacityWithUsageType" - } - ] - }, "computeCapacity": { "description": "The compute capacity allocated to this vDC.", "allOf": [ diff --git a/website/32.0.json b/website/32.0.json index 7d5678a..13fb274 100644 --- a/website/32.0.json +++ b/website/32.0.json @@ -21945,15 +21945,6 @@ } ] }, - "storageCapacity": { - "readOnly": true, - "description": "Read\\-only indicator of datastore capacity.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ProviderVdcCapacityType" - } - ] - }, "availableNetworks": { "readOnly": true, "description": "Read\\-only list of available networks.", @@ -22880,21 +22871,6 @@ "description": "User name as retrieved from, and in the encoding used by, the specified identity provider.", "type": "string" }, - "isAlertEnabled": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if alerts are enabled for the user.)", - "type": "boolean" - }, - "alertEmailPrefix": { - "deprecated": true, - "description": "This field is unused and is deprecated. (String to prepend to alert message Subject line.)", - "type": "string" - }, - "alertEmail": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if this user should get alert email.)", - "type": "string" - }, "isExternal": { "description": "On creation, specifies whether this user should be imported from the organization's LDAP service or created locally. Ignored if ProviderType is SAML or OAUTH. On retrieval, indicates whether the user is local or imported.", "type": "boolean" @@ -22903,11 +22879,6 @@ "description": "Identity provider type for this this user. One of: \n**INTEGRATED** (The user is created locally or imported from LDAP.) \n**SAML** (The user is imported from a SAML identity provider.) \n**OAUTH** (The user is imported from an OAUTH identity provider.) \n If missing or empty the default value is **INTEGRATED**.", "type": "string" }, - "isDefaultCached": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if this user is cached by default.)", - "type": "boolean" - }, "isGroupRole": { "description": "True if this user has a group role.", "type": "boolean" @@ -24021,10 +23992,6 @@ "type": "string", "format": "uri" }, - "roleAttributeName": { - "description": "The name of the SAML attribute that returns the identifiers of all roles of the user.", - "type": "string" - }, "samlAttributeMapping": { "readOnly": true, "allOf": [ @@ -26041,16 +26008,6 @@ "description": "True to allow creation of multiple external networks on the same LAN segment.", "type": "boolean" }, - "chargebackEventsKeepDays": { - "description": "Days for which events are to be kept in Chargeback Tables.", - "type": "integer", - "format": "int32" - }, - "chargebackTablesCleanupJobTimeInSeconds": { - "description": "Time of the day at which the chargeback tables cleanup job should run.", - "type": "integer", - "format": "int32" - }, "consoleProxyExternalAddress": { "description": "Use this address to access the console proxy from the public side of a firewall or load\\-balancer. \n Leave empty to clear the address.", "type": "string" @@ -26234,8 +26191,6 @@ "activityLogDisplayDays", "activityLogKeepDays", "allowOverlappingExtNets", - "chargebackEventsKeepDays", - "chargebackTablesCleanupJobTimeInSeconds", "hostCheckDelayInSeconds", "hostCheckTimeoutSeconds", "ipReservationTimeoutSeconds", @@ -26698,10 +26653,6 @@ "description": "Allows setting a login page custom theme. See the online help for more information.", "type": "string" }, - "theme": { - "description": "Deprecated. Use PreviewCustomTheme and FinalCustomTheme instead.", - "type": "string" - }, "previewCustomTheme": { "description": "Allows setting a custom theme. See the online help for more information.", "type": "string" @@ -26934,11 +26885,6 @@ "type": "integer", "format": "int32" }, - "ssl": { - "deprecated": true, - "description": "True if the SMTP server requires an SSL connection.", - "type": "boolean" - }, "smtpSecureMode": { "description": "Security protocol to use when connecting to the SMTP server. One of: \n startTls \\-\\- Use the STARTTLS protocol \n ssl \\-\\- \\-Use the SSL/TLS protocol \n none \\-\\- Do not use any security protocol", "allOf": [ @@ -27066,11 +27012,6 @@ "password": { "description": "The vSphere SSO service password for the user named in userName.", "type": "string" - }, - "vCDUrl": { - "deprecated": true, - "description": "The vCloud Director public login URL. This element is deprecated and should be left empty when using API version 5.6 and later, which obtain this address from SystemSettings:GeneralSettings:SystemExternalAddress.", - "type": "string" } }, "required": [ @@ -30364,13 +30305,6 @@ } ] }, - "property": { - "description": "User\\-specified key/value pair. This element has been superseded by the Metadata element, which is the preferred way to specify key/value pairs for objects.", - "type": "array", - "items": { - "$ref": "#/components/schemas/vcloud_PropertyType" - } - }, "dateCreated": { "readOnly": true, "description": "Creation date and time of the catalog item.", @@ -30805,12 +30739,6 @@ "description": "Capacity used. If the VDC AllocationModel is ReservationPool, this number represents the percentage of the reservation that is in use. For all other allocation models, it represents the percentage of the allocation that is in use.", "type": "integer", "format": "int64" - }, - "overhead": { - "readOnly": true, - "description": "Number of Units allocated to system resources such as vShield Manager virtual machines and shadow virtual machines provisioned from this Provider vDC.", - "type": "integer", - "format": "int64" } }, "additionalProperties": false @@ -31023,9 +30951,6 @@ "description": "An arbitrary key name. Length cannot exceed 256 UTF\\-8 characters.", "type": "string" }, - "value": { - "type": "string" - }, "typedValue": { "description": "One of: \n MetadataStringValue \n MetadataNumberValue \n MetadataBooleanValue \n MetadataDateTimeValue", "allOf": [ @@ -31175,9 +31100,6 @@ } ] }, - "value": { - "type": "string" - }, "typedValue": { "allOf": [ { @@ -33267,10 +33189,6 @@ "description": "Used to enable or disable the firewall rule. Default value is true.", "type": "boolean" }, - "matchOnTranslate": { - "description": "For DNATed traffic, match the firewall rules only after the destination IP is translated.", - "type": "boolean" - }, "description": { "description": "A description of the rule.", "type": "string" @@ -33283,28 +33201,14 @@ "description": "ICMP subtype. One of: address\\-mask\\-request, address\\-mask\\-reply, destination\\-unreachable, echo\\-request, echo\\-reply, parameter\\-problem, redirect, router\\-advertisement, router\\-solicitation, source\\-quench, time\\-exceeded, timestamp\\-request, timestamp\\-reply, any.", "type": "string" }, - "port": { - "description": "The port to which this rule applies. A value of \\-1 matches any port.", - "type": "integer", - "format": "int32" - }, "destinationPortRange": { "description": "Destination port range to which this rule applies.", "type": "string" }, - "sourcePort": { - "description": "Destination port to which this rule applies. A value of \\-1 matches any port.", - "type": "integer", - "format": "int32" - }, "sourcePortRange": { "description": "Source port range to which this rule applies.", "type": "string" }, - "direction": { - "description": "Direction of traffic to which rule applies. One of: in (rule applies to incoming traffic. This is the default value), out (rule applies to outgoing traffic).", - "type": "string" - }, "enableLogging": { "description": "Used to enable or disable firewall rule logging. Default value is false.", "type": "boolean" @@ -34290,14 +34194,6 @@ "description": "Compatibility mode. Default is false. If set to true, will allow users to write firewall rules in the old 1.5 format. The new format does not require to use direction in firewall rules. Also, for firewall rules to allow NAT traffic the filter is applied on the original IP addresses. Once set to true cannot be reverted back to false.", "type": "boolean" }, - "ipScope": { - "description": "Includes IP level configuration items such as gateway, dns, subnet, IP address pool to be used for allocation. Note that the pool of IP addresses needs to fall within the subnet/mask of the IpScope.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_IpScopeType" - } - ] - }, "ipScopes": { "description": "A list of IP scopes for the network.", "allOf": [ @@ -34348,10 +34244,6 @@ } ] }, - "advancedNetworkingEnabled": { - "description": "True if Advanced Networking has been enabled.", - "type": "boolean" - }, "subInterface": { "description": "True if Network is connected to an Edge Gateway subinterface.", "type": "boolean" @@ -43313,14 +43205,6 @@ "description": "Set to true to delete the source object after the operation completes.", "type": "boolean" }, - "sourcedVmInstantiationParams": { - "deprecated": true, - "description": "Represents virtual machine instantiation parameters.", - "type": "array", - "items": { - "$ref": "#/components/schemas/vcloud_SourcedVmInstantiationParamsType" - } - }, "sourcedItem": { "description": "Represents VM instantiation parameters. If this section is present, then SourcedVmInstantiationParamsType section (if present) will be ignored.", "type": "array", @@ -43602,15 +43486,6 @@ "$ref": "#/components/schemas/vcloud_CaptureVmParamsType" } }, - "vdcStorageProfile": { - "deprecated": true, - "description": "A reference to the storage profile to be specified in the vApp template created by this capture. Ignored by vCloud Director 5.5 and later.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ReferenceType" - } - ] - }, "targetCatalogItem": { "description": "To overwrite an existing vApp template with the one created by this capture, place a reference to the existing template here. Otherwise, the operation creates a new vApp template.", "allOf": [ @@ -44145,14 +44020,6 @@ "description": "The allocation model used by this vDC. One of: \n**AllocationVApp** (Pay as you go. Resources are committed to a vDC only when vApps are created in it. When you use this allocation model, any Limit values you specify for Memory and CPU are ignored on create and returned as 0 on retrieve.) \n**AllocationPool** (Only a percentage of the resources you allocate are committed to the organization vDC.) \n**ReservationPool** (All the resources you allocate are committed as a pool to the organization vDC. vApps in vDCs that support this allocation model can specify values for resource and limit.) \n**Flex** (Only a percentage of the resources you allocate are committed to the organization vDC. You can allocate zero resources also and make it behave like a Pay\\-As\\-You\\-Go type. Based on the values chosen for allocated resources and limits, this vDC can be made to behave as any of the existing three types.)", "type": "string" }, - "storageCapacity": { - "description": "The storage capacity allocated to this vDC.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_CapacityWithUsageType" - } - ] - }, "computeCapacity": { "description": "The compute capacity allocated to this vDC.", "allOf": [ diff --git a/website/33.0.json b/website/33.0.json index c3ebe5e..87fa206 100644 --- a/website/33.0.json +++ b/website/33.0.json @@ -22108,15 +22108,6 @@ } ] }, - "storageCapacity": { - "readOnly": true, - "description": "Read\\-only indicator of datastore capacity.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ProviderVdcCapacityType" - } - ] - }, "availableNetworks": { "readOnly": true, "description": "Read\\-only list of available networks.", @@ -23043,21 +23034,6 @@ "description": "User name as retrieved from, and in the encoding used by, the specified identity provider.", "type": "string" }, - "isAlertEnabled": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if alerts are enabled for the user.)", - "type": "boolean" - }, - "alertEmailPrefix": { - "deprecated": true, - "description": "This field is unused and is deprecated. (String to prepend to alert message Subject line.)", - "type": "string" - }, - "alertEmail": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if this user should get alert email.)", - "type": "string" - }, "isExternal": { "description": "On creation, specifies whether this user should be imported from the organization's LDAP service or created locally. Ignored if ProviderType is SAML or OAUTH. On retrieval, indicates whether the user is local or imported.", "type": "boolean" @@ -23066,11 +23042,6 @@ "description": "Identity provider type for this this user. One of: \n**INTEGRATED** (The user is created locally or imported from LDAP.) \n**SAML** (The user is imported from a SAML identity provider.) \n**OAUTH** (The user is imported from an OAUTH identity provider.) \n If missing or empty the default value is **INTEGRATED**.", "type": "string" }, - "isDefaultCached": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if this user is cached by default.)", - "type": "boolean" - }, "isGroupRole": { "description": "True if this user has a group role.", "type": "boolean" @@ -24184,10 +24155,6 @@ "type": "string", "format": "uri" }, - "roleAttributeName": { - "description": "The name of the SAML attribute that returns the identifiers of all roles of the user.", - "type": "string" - }, "samlAttributeMapping": { "readOnly": true, "allOf": [ @@ -26204,16 +26171,6 @@ "description": "True to allow creation of multiple external networks on the same LAN segment.", "type": "boolean" }, - "chargebackEventsKeepDays": { - "description": "Days for which events are to be kept in Chargeback Tables.", - "type": "integer", - "format": "int32" - }, - "chargebackTablesCleanupJobTimeInSeconds": { - "description": "Time of the day at which the chargeback tables cleanup job should run.", - "type": "integer", - "format": "int32" - }, "consoleProxyExternalAddress": { "description": "Use this address to access the console proxy from the public side of a firewall or load\\-balancer. \n Leave empty to clear the address.", "type": "string" @@ -26397,8 +26354,6 @@ "activityLogDisplayDays", "activityLogKeepDays", "allowOverlappingExtNets", - "chargebackEventsKeepDays", - "chargebackTablesCleanupJobTimeInSeconds", "hostCheckDelayInSeconds", "hostCheckTimeoutSeconds", "ipReservationTimeoutSeconds", @@ -26861,10 +26816,6 @@ "description": "Allows setting a login page custom theme. See the online help for more information.", "type": "string" }, - "theme": { - "description": "Deprecated. Use PreviewCustomTheme and FinalCustomTheme instead.", - "type": "string" - }, "previewCustomTheme": { "description": "Allows setting a custom theme. See the online help for more information.", "type": "string" @@ -27097,11 +27048,6 @@ "type": "integer", "format": "int32" }, - "ssl": { - "deprecated": true, - "description": "True if the SMTP server requires an SSL connection.", - "type": "boolean" - }, "smtpSecureMode": { "description": "Security protocol to use when connecting to the SMTP server. One of: \n startTls \\-\\- Use the STARTTLS protocol \n ssl \\-\\- \\-Use the SSL/TLS protocol \n none \\-\\- Do not use any security protocol", "allOf": [ @@ -27229,11 +27175,6 @@ "password": { "description": "The vSphere SSO service password for the user named in userName.", "type": "string" - }, - "vCDUrl": { - "deprecated": true, - "description": "The vCloud Director public login URL. This element is deprecated and should be left empty when using API version 5.6 and later, which obtain this address from SystemSettings:GeneralSettings:SystemExternalAddress.", - "type": "string" } }, "required": [ @@ -27386,10 +27327,6 @@ "type": "integer", "format": "int32" }, - "allowVcTenantAndProviderScoped": { - "description": "True to allow VCs to be both provider scoped (used to back a PVDC), and tenant scoped (encapsulated within an SDDC).", - "type": "boolean" - }, "allowInsecureSddcProxying": { "description": "True to allow proxying over insecure HTTP in addition to HTTPS. It is recommended that insecure proxying be left disabled.", "type": "boolean" @@ -28579,15 +28516,6 @@ } ] }, - "vxlanNetworkPool": { - "deprecated": true, - "description": "Deprecated. Use \"NetworkPool\" property. Reference to a VXLAN Network Pool to be assigned to this Provider VDC. Leave empty to have the system create the VXLAN pool and assign it to the Provider VDC.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ReferenceType" - } - ] - }, "networkPool": { "description": "Reference to a Geneve or VXLAN Network Pool to be assigned to this Provider VDC. Leave empty to have the system create a default VXLAN pool and assign it to the Provider VDC.", "allOf": [ @@ -30633,13 +30561,6 @@ } ] }, - "property": { - "description": "User\\-specified key/value pair. This element has been superseded by the Metadata element, which is the preferred way to specify key/value pairs for objects.", - "type": "array", - "items": { - "$ref": "#/components/schemas/vcloud_PropertyType" - } - }, "dateCreated": { "readOnly": true, "description": "Creation date and time of the catalog item.", @@ -31087,12 +31008,6 @@ "description": "Capacity used. If the VDC AllocationModel is ReservationPool, this number represents the percentage of the reservation that is in use. For all other allocation models, it represents the percentage of the allocation that is in use.", "type": "integer", "format": "int64" - }, - "overhead": { - "readOnly": true, - "description": "Number of Units allocated to system resources such as vShield Manager virtual machines and shadow virtual machines provisioned from this Provider vDC.", - "type": "integer", - "format": "int64" } }, "additionalProperties": false @@ -31305,9 +31220,6 @@ "description": "An arbitrary key name. Length cannot exceed 256 UTF\\-8 characters.", "type": "string" }, - "value": { - "type": "string" - }, "typedValue": { "description": "One of: \n MetadataStringValue \n MetadataNumberValue \n MetadataBooleanValue \n MetadataDateTimeValue", "allOf": [ @@ -31457,9 +31369,6 @@ } ] }, - "value": { - "type": "string" - }, "typedValue": { "allOf": [ { @@ -33570,10 +33479,6 @@ "description": "Used to enable or disable the firewall rule. Default value is true.", "type": "boolean" }, - "matchOnTranslate": { - "description": "For DNATed traffic, match the firewall rules only after the destination IP is translated.", - "type": "boolean" - }, "description": { "description": "A description of the rule.", "type": "string" @@ -33586,28 +33491,14 @@ "description": "ICMP subtype. One of: address\\-mask\\-request, address\\-mask\\-reply, destination\\-unreachable, echo\\-request, echo\\-reply, parameter\\-problem, redirect, router\\-advertisement, router\\-solicitation, source\\-quench, time\\-exceeded, timestamp\\-request, timestamp\\-reply, any.", "type": "string" }, - "port": { - "description": "The port to which this rule applies. A value of \\-1 matches any port.", - "type": "integer", - "format": "int32" - }, "destinationPortRange": { "description": "Destination port range to which this rule applies.", "type": "string" }, - "sourcePort": { - "description": "Destination port to which this rule applies. A value of \\-1 matches any port.", - "type": "integer", - "format": "int32" - }, "sourcePortRange": { "description": "Source port range to which this rule applies.", "type": "string" }, - "direction": { - "description": "Direction of traffic to which rule applies. One of: in (rule applies to incoming traffic. This is the default value), out (rule applies to outgoing traffic).", - "type": "string" - }, "enableLogging": { "description": "Used to enable or disable firewall rule logging. Default value is false.", "type": "boolean" @@ -34593,14 +34484,6 @@ "description": "Compatibility mode. Default is false. If set to true, will allow users to write firewall rules in the old 1.5 format. The new format does not require to use direction in firewall rules. Also, for firewall rules to allow NAT traffic the filter is applied on the original IP addresses. Once set to true cannot be reverted back to false.", "type": "boolean" }, - "ipScope": { - "description": "Includes IP level configuration items such as gateway, dns, subnet, IP address pool to be used for allocation. Note that the pool of IP addresses needs to fall within the subnet/mask of the IpScope.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_IpScopeType" - } - ] - }, "ipScopes": { "description": "A list of IP scopes for the network.", "allOf": [ @@ -34651,10 +34534,6 @@ } ] }, - "advancedNetworkingEnabled": { - "description": "True if Advanced Networking has been enabled.", - "type": "boolean" - }, "subInterface": { "description": "True if Network is connected to an Edge Gateway subinterface.", "type": "boolean" @@ -42042,13 +41921,6 @@ { "type": "object", "properties": { - "operation": { - "description": "An operation that will be enabled as a blocking task. See the vCloud API Programming Guide for the operation names.", - "type": "array", - "items": { - "type": "string" - } - }, "taskOperationType": { "description": "An operation, along with its category, that will be enabled as a blocking task. See the vCloud API Programming Guide for the operation names.", "type": "array", @@ -44028,14 +43900,6 @@ "description": "Set to true to delete the source object after the operation completes.", "type": "boolean" }, - "sourcedVmInstantiationParams": { - "deprecated": true, - "description": "Represents virtual machine instantiation parameters.", - "type": "array", - "items": { - "$ref": "#/components/schemas/vcloud_SourcedVmInstantiationParamsType" - } - }, "sourcedItem": { "description": "Represents VM instantiation parameters. If this section is present, then SourcedVmInstantiationParamsType section (if present) will be ignored.", "type": "array", @@ -44317,15 +44181,6 @@ "$ref": "#/components/schemas/vcloud_CaptureVmParamsType" } }, - "vdcStorageProfile": { - "deprecated": true, - "description": "A reference to the storage profile to be specified in the vApp template created by this capture. Ignored by vCloud Director 5.5 and later.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ReferenceType" - } - ] - }, "targetCatalogItem": { "description": "To overwrite an existing vApp template with the one created by this capture, place a reference to the existing template here. Otherwise, the operation creates a new vApp template.", "allOf": [ @@ -44870,14 +44725,6 @@ "description": "The allocation model used by this vDC. One of: \n**AllocationVApp** (Pay as you go. Resources are committed to a vDC only when vApps are created in it. When you use this allocation model, any Limit values you specify for Memory and CPU are ignored on create and returned as 0 on retrieve.) \n**AllocationPool** (Only a percentage of the resources you allocate are committed to the organization vDC.) \n**ReservationPool** (All the resources you allocate are committed as a pool to the organization vDC. vApps in vDCs that support this allocation model can specify values for resource and limit.) \n**Flex** (Only a percentage of the resources you allocate are committed to the organization vDC. You can allocate zero resources also and make it behave like a Pay\\-As\\-You\\-Go type. Based on the values chosen for allocated resources and limits, this vDC can be made to behave as any of the existing three types.)", "type": "string" }, - "storageCapacity": { - "description": "The storage capacity allocated to this vDC.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_CapacityWithUsageType" - } - ] - }, "computeCapacity": { "description": "The compute capacity allocated to this vDC.", "allOf": [ diff --git a/website/34.0.json b/website/34.0.json index c709694..47fcbee 100644 --- a/website/34.0.json +++ b/website/34.0.json @@ -21618,15 +21618,6 @@ } ] }, - "storageCapacity": { - "readOnly": true, - "description": "Read\\-only indicator of datastore capacity.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ProviderVdcCapacityType" - } - ] - }, "availableNetworks": { "readOnly": true, "description": "Read\\-only list of available networks.", @@ -22557,21 +22548,6 @@ "description": "User name as retrieved from, and in the encoding used by, the specified identity provider.", "type": "string" }, - "isAlertEnabled": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if alerts are enabled for the user.)", - "type": "boolean" - }, - "alertEmailPrefix": { - "deprecated": true, - "description": "This field is unused and is deprecated. (String to prepend to alert message Subject line.)", - "type": "string" - }, - "alertEmail": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if this user should get alert email.)", - "type": "string" - }, "isExternal": { "description": "On creation, specifies whether this user should be imported from the organization's LDAP service or created locally. Ignored if ProviderType is SAML or OAUTH. On retrieval, indicates whether the user is local or imported.", "type": "boolean" @@ -22580,11 +22556,6 @@ "description": "Identity provider type for this this user. One of: \n**INTEGRATED** (The user is created locally or imported from LDAP.) \n**SAML** (The user is imported from a SAML identity provider.) \n**OAUTH** (The user is imported from an OAUTH identity provider.) \n If missing or empty the default value is **INTEGRATED**.", "type": "string" }, - "isDefaultCached": { - "deprecated": true, - "description": "This field is unused and is deprecated. (True if this user is cached by default.)", - "type": "boolean" - }, "isGroupRole": { "description": "True if this user has a group role.", "type": "boolean" @@ -23704,10 +23675,6 @@ "type": "string", "format": "uri" }, - "roleAttributeName": { - "description": "The name of the SAML attribute that returns the identifiers of all roles of the user.", - "type": "string" - }, "samlAttributeMapping": { "readOnly": true, "allOf": [ @@ -25728,16 +25695,6 @@ "description": "True to allow creation of multiple external networks on the same LAN segment.", "type": "boolean" }, - "chargebackEventsKeepDays": { - "description": "Days for which events are to be kept in Chargeback Tables.", - "type": "integer", - "format": "int32" - }, - "chargebackTablesCleanupJobTimeInSeconds": { - "description": "Time of the day at which the chargeback tables cleanup job should run.", - "type": "integer", - "format": "int32" - }, "consoleProxyExternalAddress": { "description": "Use this address to access the console proxy from the public side of a firewall or load\\-balancer. \n Leave empty to clear the address.", "type": "string" @@ -25921,8 +25878,6 @@ "activityLogDisplayDays", "activityLogKeepDays", "allowOverlappingExtNets", - "chargebackEventsKeepDays", - "chargebackTablesCleanupJobTimeInSeconds", "hostCheckDelayInSeconds", "hostCheckTimeoutSeconds", "ipReservationTimeoutSeconds", @@ -26387,10 +26342,6 @@ "description": "Allows setting a login page custom theme. See the online help for more information.", "type": "string" }, - "theme": { - "description": "Deprecated. Use PreviewCustomTheme and FinalCustomTheme instead.", - "type": "string" - }, "previewCustomTheme": { "description": "Allows setting a custom theme. See the online help for more information.", "type": "string" @@ -26623,11 +26574,6 @@ "type": "integer", "format": "int32" }, - "ssl": { - "deprecated": true, - "description": "True if the SMTP server requires an SSL connection.", - "type": "boolean" - }, "smtpSecureMode": { "description": "Security protocol to use when connecting to the SMTP server. One of: \n startTls \\-\\- Use the STARTTLS protocol \n ssl \\-\\- \\-Use the SSL/TLS protocol \n none \\-\\- Do not use any security protocol", "allOf": [ @@ -26759,11 +26705,6 @@ "password": { "description": "The vSphere SSO service password for the user named in userName.", "type": "string" - }, - "vCDUrl": { - "deprecated": true, - "description": "The vCloud Director public login URL. This element is deprecated and should be left empty when using API version 5.6 and later, which obtain this address from SystemSettings:GeneralSettings:SystemExternalAddress.", - "type": "string" } }, "required": [ @@ -26916,10 +26857,6 @@ "type": "integer", "format": "int32" }, - "allowVcTenantAndProviderScoped": { - "description": "True to allow VCs to be both provider scoped (used to back a PVDC), and tenant scoped (encapsulated within an SDDC).", - "type": "boolean" - }, "allowInsecureSddcProxying": { "description": "True to allow proxying over insecure HTTP in addition to HTTPS. It is recommended that insecure proxying be left disabled.", "type": "boolean" @@ -28130,15 +28067,6 @@ } ] }, - "vxlanNetworkPool": { - "deprecated": true, - "description": "Deprecated. Use \"NetworkPool\" property. Reference to a VXLAN Network Pool to be assigned to this Provider VDC. Leave empty to have the system create the VXLAN pool and assign it to the Provider VDC.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ReferenceType" - } - ] - }, "networkPool": { "description": "Reference to a Geneve or VXLAN Network Pool to be assigned to this Provider VDC. Leave empty to have the system create a default VXLAN pool and assign it to the Provider VDC.", "allOf": [ @@ -30191,13 +30119,6 @@ } ] }, - "property": { - "description": "User\\-specified key/value pair. This element has been superseded by the Metadata element, which is the preferred way to specify key/value pairs for objects.", - "type": "array", - "items": { - "$ref": "#/components/schemas/vcloud_PropertyType" - } - }, "dateCreated": { "readOnly": true, "description": "Creation date and time of the catalog item.", @@ -30645,12 +30566,6 @@ "description": "Capacity used. If the VDC AllocationModel is ReservationPool, this number represents the percentage of the reservation that is in use. For all other allocation models, it represents the percentage of the allocation that is in use.", "type": "integer", "format": "int64" - }, - "overhead": { - "readOnly": true, - "description": "Number of Units allocated to system resources such as vShield Manager virtual machines and shadow virtual machines provisioned from this Provider vDC.", - "type": "integer", - "format": "int64" } }, "additionalProperties": false @@ -30863,9 +30778,6 @@ "description": "An arbitrary key name. Length cannot exceed 256 UTF\\-8 characters.", "type": "string" }, - "value": { - "type": "string" - }, "typedValue": { "description": "One of: \n MetadataStringValue \n MetadataNumberValue \n MetadataBooleanValue \n MetadataDateTimeValue", "allOf": [ @@ -31015,9 +30927,6 @@ } ] }, - "value": { - "type": "string" - }, "typedValue": { "allOf": [ { @@ -33133,10 +33042,6 @@ "description": "Used to enable or disable the firewall rule. Default value is true.", "type": "boolean" }, - "matchOnTranslate": { - "description": "For DNATed traffic, match the firewall rules only after the destination IP is translated.", - "type": "boolean" - }, "description": { "description": "A description of the rule.", "type": "string" @@ -33149,28 +33054,14 @@ "description": "ICMP subtype. One of: address\\-mask\\-request, address\\-mask\\-reply, destination\\-unreachable, echo\\-request, echo\\-reply, parameter\\-problem, redirect, router\\-advertisement, router\\-solicitation, source\\-quench, time\\-exceeded, timestamp\\-request, timestamp\\-reply, any.", "type": "string" }, - "port": { - "description": "The port to which this rule applies. A value of \\-1 matches any port.", - "type": "integer", - "format": "int32" - }, "destinationPortRange": { "description": "Destination port range to which this rule applies.", "type": "string" }, - "sourcePort": { - "description": "Destination port to which this rule applies. A value of \\-1 matches any port.", - "type": "integer", - "format": "int32" - }, "sourcePortRange": { "description": "Source port range to which this rule applies.", "type": "string" }, - "direction": { - "description": "Direction of traffic to which rule applies. One of: in (rule applies to incoming traffic. This is the default value), out (rule applies to outgoing traffic).", - "type": "string" - }, "enableLogging": { "description": "Used to enable or disable firewall rule logging. Default value is false.", "type": "boolean" @@ -34156,14 +34047,6 @@ "description": "Compatibility mode. Default is false. If set to true, will allow users to write firewall rules in the old 1.5 format. The new format does not require to use direction in firewall rules. Also, for firewall rules to allow NAT traffic the filter is applied on the original IP addresses. Once set to true cannot be reverted back to false.", "type": "boolean" }, - "ipScope": { - "description": "Includes IP level configuration items such as gateway, dns, subnet, IP address pool to be used for allocation. Note that the pool of IP addresses needs to fall within the subnet/mask of the IpScope.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_IpScopeType" - } - ] - }, "ipScopes": { "description": "A list of IP scopes for the network.", "allOf": [ @@ -34214,10 +34097,6 @@ } ] }, - "advancedNetworkingEnabled": { - "description": "True if Advanced Networking has been enabled.", - "type": "boolean" - }, "subInterface": { "description": "True if Network is connected to an Edge Gateway subinterface.", "type": "boolean" @@ -41855,13 +41734,6 @@ { "type": "object", "properties": { - "operation": { - "description": "An operation that will be enabled as a blocking task. See the vCloud API Programming Guide for the operation names.", - "type": "array", - "items": { - "type": "string" - } - }, "taskOperationType": { "description": "An operation, along with its category, that will be enabled as a blocking task. See the vCloud API Programming Guide for the operation names.", "type": "array", @@ -43884,14 +43756,6 @@ "description": "Set to true to delete the source object after the operation completes.", "type": "boolean" }, - "sourcedVmInstantiationParams": { - "deprecated": true, - "description": "Represents virtual machine instantiation parameters.", - "type": "array", - "items": { - "$ref": "#/components/schemas/vcloud_SourcedVmInstantiationParamsType" - } - }, "sourcedItem": { "description": "Represents VM instantiation parameters. If this section is present, then SourcedVmInstantiationParamsType section (if present) will be ignored.", "type": "array", @@ -44206,15 +44070,6 @@ "$ref": "#/components/schemas/vcloud_CaptureVmParamsType" } }, - "vdcStorageProfile": { - "deprecated": true, - "description": "A reference to the storage profile to be specified in the vApp template created by this capture. Ignored by vCloud Director 5.5 and later.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_ReferenceType" - } - ] - }, "targetCatalogItem": { "description": "To overwrite an existing vApp template with the one created by this capture, place a reference to the existing template here. Otherwise, the operation creates a new vApp template.", "allOf": [ @@ -44759,14 +44614,6 @@ "description": "The allocation model used by this vDC. One of: \n**AllocationVApp** (Pay as you go. Resources are committed to a vDC only when vApps are created in it. When you use this allocation model, any Limit values you specify for Memory and CPU are ignored on create and returned as 0 on retrieve.) \n**AllocationPool** (Only a percentage of the resources you allocate are committed to the organization vDC.) \n**ReservationPool** (All the resources you allocate are committed as a pool to the organization vDC. vApps in vDCs that support this allocation model can specify values for resource and limit.) \n**Flex** (Only a percentage of the resources you allocate are committed to the organization vDC. You can allocate zero resources also and make it behave like a Pay\\-As\\-You\\-Go type. Based on the values chosen for allocated resources and limits, this vDC can be made to behave as any of the existing three types.)", "type": "string" }, - "storageCapacity": { - "description": "The storage capacity allocated to this vDC.", - "allOf": [ - { - "$ref": "#/components/schemas/vcloud_CapacityWithUsageType" - } - ] - }, "computeCapacity": { "description": "The compute capacity allocated to this vDC.", "allOf": [