Merge pull request #3126 from Mjoycarry/automated-cherry-pick-of-#3026-upstream-release-2.12

Automated cherry pick of #3026: nat_docs fix
This commit is contained in:
Zexi Li
2019-10-08 10:42:27 +08:00
committed by GitHub
4 changed files with 21 additions and 7 deletions

View File

@@ -179,10 +179,10 @@ paths:
$ref: "./natgateway/natgateways.yaml"
/natgateways/{natgatewayId}:
$ref: "./natgateway/natgateway.yaml"
/natgateways/{natgatewayId}/dnat-eips:
$ref: "./natgateway/dnat-eips.yaml"
/natgateways/{natgatewayId}/snat-eips:
$ref: "./natgateway/snat-eips.yaml"
/natgateways/{natgatewayId}/dnat-resources:
$ref: "./natgateway/dnat-resources.yaml"
/natgateways/{natgatewayId}/snat-resources:
$ref: "./natgateway/snat-resources.yaml"
/natdentries:
$ref: "./natgateway/dnatentries.yaml"
/natdentries/{dnatentryId}:

View File

@@ -6,7 +6,7 @@ post:
200:
description: DNAT规则EIP集合
schema:
- $ref: "../schemas/natgateway.yaml#/EIPAddrs"
- $ref: "../schemas/natgateway.yaml#/DNATResources"
tags:
- natgateway

View File

@@ -6,6 +6,6 @@ post:
200:
description: SNAT规则EIP集合
schema:
- $ref: "../schemas/natgateway.yaml#/EIPAddrs"
- $ref: "../schemas/natgateway.yaml#/SNATResources"
tags:
- natgateway

View File

@@ -347,7 +347,7 @@ SNatEntryCreate:
example: 192.168.1.0/24
description: 映射到公网IP的内网网段(和network_id互斥只需要传入一个
EIPAddrs:
DNATResources:
type: object
properties:
eips:
@@ -355,3 +355,17 @@ EIPAddrs:
items:
type: string
example: [34.23.125.45, 23.45.123.56]
SNATResources:
type: object
properties:
eips:
type: array
items:
type: string
example: [34.23.125.45, 23.45.123.56]
networks:
type: array
items:
type: string
example: []