Commit f5eef6a4 authored by Eisha Ayaz's avatar Eisha Ayaz Committed by Giacomo Bernini
Browse files

[datamodel-upd][SOL002][VNF-LCM][v5.2.1][6.3.5.x.x Test-IDs] Add attributes for type CpProtocolData

parent 8b54e9f0
Loading
Loading
Loading
Loading
+14 −2
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@
																	"format": "MAC"
																},
																"segmentationType": {
																	"description": "Specifies the encapsulation type for the traffics coming in and out of the trunk subport. Permitted values: -\tVLAN: the subport uses VLAN as encapsulation type. -\tINHERIT: the subport gets its segmentation type from the network itΓÇÖs connected to. This attribute may be present for CP instances that represent subports in a trunk and shall be absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used.\n",
																	"description": "Specifies the encapsulation type for the traffics coming in and out of the trunk subport. Permitted values: -\tVLAN: the subport uses VLAN as encapsulation type. -\tINHERIT: the subport gets its segmentation type from the network its connected to. This attribute may be present for CP instances that represent subports in a trunk and shall be absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used.\n",
																	"type": "string",
																	"enum": [
																		"VLAN",
@@ -977,7 +977,7 @@
															}
														},
														"virtualCpAddress": {
															"description": "This type represents network address data for a virtual CP.\n* NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the \n          CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored.\n\n* NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container\n          cluster will assign an IP address.\n\n* NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP \n          address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for \n          Kubernetes® that supports configuration of address pools for load balancer services.\n\n* NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time.\n",
															"description": "This type represents network address data for a virtual CP.\n* NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the \n          CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored.\n\n* NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container\n          cluster will assign an IP address.\n\n* NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP \n          address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for \n          Kubernetes® that supports configuration of address pools for load balancer services.\n\n* NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time.\n",
															"type": "object",
															"required": [
																"type"
@@ -1026,6 +1026,18 @@
																	}
																}
															}
														},
														"fullyQualifiedDomainNames": {
														"description": "Specifies the fully qualified domain names (FQDN) to apply to the CP.\n",
														"type": "array",
														"items": {
															"type": "string"
														},
														"relativeDomainNames": {
														"description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
														"type": "array",
														"items": {
															"type": "string"
														}
													}
												}
+38 −24
Original line number Diff line number Diff line
@@ -1643,7 +1643,7 @@
																							"format": "MAC"
																						},
																						"segmentationType": {
																							"description": "Specifies the encapsulation type for the traffics coming in and out of the trunk subport. Permitted values: -\tVLAN: the subport uses VLAN as encapsulation type. -\tINHERIT: the subport gets its segmentation type from the network itΓÇÖs connected to. This attribute may be present for CP instances that represent subports in a trunk and shall be absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used.\n",
																							"description": "Specifies the encapsulation type for the traffics coming in and out of the trunk subport. Permitted values: -\tVLAN: the subport uses VLAN as encapsulation type. -\tINHERIT: the subport gets its segmentation type from the network its connected to. This attribute may be present for CP instances that represent subports in a trunk and shall be absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used.\n",
																							"type": "string",
																							"enum": [
																								"VLAN",
@@ -1731,7 +1731,7 @@
																					}
																				},
																				"virtualCpAddress": {
																					"description": "This type represents network address data for a virtual CP.\n* NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the \n          CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored.\n\n* NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container\n          cluster will assign an IP address.\n\n* NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP \n          address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for \n          Kubernetes® that supports configuration of address pools for load balancer services.\n\n* NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time.\n",
																					"description": "This type represents network address data for a virtual CP.\n* NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the \n          CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored.\n\n* NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container\n          cluster will assign an IP address.\n\n* NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP \n          address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for \n          Kubernetes® that supports configuration of address pools for load balancer services.\n\n* NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time.\n",
																					"type": "object",
																					"required": [
																						"type"
@@ -1780,6 +1780,20 @@
																							}
																						}
																					}
																				},
																				"fullyQualifiedDomainNames": {
																					"description": "Specifies the fully qualified domain names (FQDN) to apply to the CP.\n",
																					"type": "array",
																					"items": {
																						"type": "string"
																					}
																				},
																				"relativeDomainNames": {
																					"description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
																					"type": "array",
																					"items": {
																						"type": "string"	
																					}
																				}
																			}
																		}
+24 −10
Original line number Diff line number Diff line
@@ -1645,7 +1645,7 @@
																								"format": "MAC"
																							},
																							"segmentationType": {
																								"description": "Specifies the encapsulation type for the traffics coming in and out of the trunk subport. Permitted values: -\tVLAN: the subport uses VLAN as encapsulation type. -\tINHERIT: the subport gets its segmentation type from the network itΓÇÖs connected to. This attribute may be present for CP instances that represent subports in a trunk and shall be absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used.\n",
																								"description": "Specifies the encapsulation type for the traffics coming in and out of the trunk subport. Permitted values: -\tVLAN: the subport uses VLAN as encapsulation type. -\tINHERIT: the subport gets its segmentation type from the network its connected to. This attribute may be present for CP instances that represent subports in a trunk and shall be absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used.\n",
																								"type": "string",
																								"enum": [
																									"VLAN",
@@ -1733,7 +1733,7 @@
																						}
																					},
																					"virtualCpAddress": {
																						"description": "This type represents network address data for a virtual CP.\n* NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the \n          CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored.\n\n* NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container\n          cluster will assign an IP address.\n\n* NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP \n          address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for \n          Kubernetes® that supports configuration of address pools for load balancer services.\n\n* NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time.\n",
																						"description": "This type represents network address data for a virtual CP.\n* NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the \n          CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored.\n\n* NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container\n          cluster will assign an IP address.\n\n* NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP \n          address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for \n          Kubernetes® that supports configuration of address pools for load balancer services.\n\n* NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time.\n",
																						"type": "object",
																						"required": [
																							"type"
@@ -1782,6 +1782,20 @@
																								}
																							}
																						}
																					},
																					"fullyQualifiedDomainNames": {
																						"description": "Specifies the fully qualified domain names (FQDN) to apply to the CP.\n",
																						"type": "array",
																						"items": {
																							"type": "string"
																						}
																					},
																					"relativeDomainNames": {
																						"description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
																						"type": "array",
																						"items": {
																							"type": "string"	
																						}
																					}
																				}
																			}
+16 −2
Original line number Diff line number Diff line
@@ -1588,7 +1588,7 @@
                                      "format": "MAC"
                                    },
                                    "segmentationType": {
                                      "description": "Specifies the encapsulation type for the traffics coming in and out of the trunk subport. Permitted values: -\tVLAN: the subport uses VLAN as encapsulation type. -\tINHERIT: the subport gets its segmentation type from the network itΓÇÖs connected to. This attribute may be present for CP instances that represent subports in a trunk and shall be absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used.\n",
                                      "description": "Specifies the encapsulation type for the traffics coming in and out of the trunk subport. Permitted values: -\tVLAN: the subport uses VLAN as encapsulation type. -\tINHERIT: the subport gets its segmentation type from the network its connected to. This attribute may be present for CP instances that represent subports in a trunk and shall be absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used.\n",
                                      "type": "string",
                                      "enum": [
                                        "VLAN",
@@ -1676,7 +1676,7 @@
                                  }
                                },
                                "virtualCpAddress": {
                                  "description": "This type represents network address data for a virtual CP.\n* NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the \n          CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored.\n\n* NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container\n          cluster will assign an IP address.\n\n* NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP \n          address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for \n          Kubernetes® that supports configuration of address pools for load balancer services.\n\n* NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time.\n",
                                  "description": "This type represents network address data for a virtual CP.\n* NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the \n          CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored.\n\n* NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container\n          cluster will assign an IP address.\n\n* NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP \n          address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for \n          Kubernetes® that supports configuration of address pools for load balancer services.\n\n* NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time.\n",
                                  "type": "object",
                                  "required": [
                                    "type"
@@ -1725,6 +1725,20 @@
                                      }
                                    }
                                  }
                                },
                                "fullyQualifiedDomainNames": {
                                  "description": "Specifies the fully qualified domain names (FQDN) to apply to the CP.\n",
                                  "type": "array",
                                  "items": {
                                    "type": "string"
                                  } 
                                },
                                "relativeDomainNames": {
                                  "description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
                                  "type": "array",
                                  "items": {
                                    "type": "string"  
                                  }
                                }
                              }
                            }
+16 −2
Original line number Diff line number Diff line
@@ -1590,7 +1590,7 @@
                                        "format": "MAC"
                                      },
                                      "segmentationType": {
                                        "description": "Specifies the encapsulation type for the traffics coming in and out of the trunk subport. Permitted values: -\tVLAN: the subport uses VLAN as encapsulation type. -\tINHERIT: the subport gets its segmentation type from the network itΓÇÖs connected to. This attribute may be present for CP instances that represent subports in a trunk and shall be absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used.\n",
                                        "description": "Specifies the encapsulation type for the traffics coming in and out of the trunk subport. Permitted values: -\tVLAN: the subport uses VLAN as encapsulation type. -\tINHERIT: the subport gets its segmentation type from the network its connected to. This attribute may be present for CP instances that represent subports in a trunk and shall be absent otherwise. If this attribute is not present for a subport CP instance, default value VLAN shall be used.\n",
                                        "type": "string",
                                        "enum": [
                                          "VLAN",
@@ -1678,7 +1678,7 @@
                                    }
                                  },
                                  "virtualCpAddress": {
                                    "description": "This type represents network address data for a virtual CP.\n* NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the \n          CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored.\n\n* NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container\n          cluster will assign an IP address.\n\n* NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP \n          address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for \n          Kubernetes® that supports configuration of address pools for load balancer services.\n\n* NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time.\n",
                                      "description": "This type represents network address data for a virtual CP.\n* NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the \n          CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored.\n\n* NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container\n          cluster will assign an IP address.\n\n* NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP \n          address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for \n          Kubernetes® that supports configuration of address pools for load balancer services.\n\n* NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time.\n",
                                    "type": "object",
                                    "required": [
                                      "type"
@@ -1727,6 +1727,20 @@
                                        }
                                      }
                                    }
                                  },
                                  "fullyQualifiedDomainNames": {
                                    "description": "Specifies the fully qualified domain names (FQDN) to apply to the CP.\n",
                                    "type": "array",
                                    "items": {
                                      "type": "string"
                                    }
                                  },
                                  "relativeDomainNames": {
                                    "description": "Specifies values of relative domain names to be considered when setting  the fully qualified domain names.\n",
                                    "type": "array",
                                    "items": {
                                      "type": "string"  
                                    } 
                                  }
                                }
                              }
Loading