x
/
fuel-plugin-contrail
Code Issues Proposed changes

regex for plugin settings clarified 

Change-Id: I2661a90961a7501287ac439d5193ab078597a1a1
Closes-Bug: #1594356
Closes-Bug: #1594360
Closes-Bug: #1594365
This commit is contained in:
Vitalii Kovalchuk 2016-07-01 16:23:49 +03:00
parent d2b5d00dcf
commit 94c60b91e2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
environment_config.yaml
View File

@ -11,7 +11,7 @@ attributes:
weight: 20
type: "text"
regex:
source: '^(?:(6553[0-4])|(655[0-2]\d)|(65[0-4]\d{2})|(6[0-4]\d{3})|([1-5]\d{4})|([1-9][0-9]{0,2}))$'
source: '^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$'
error: "Invalid AS number"
contrail_gateways:
value: '10.109.4.250'
@ -20,7 +20,7 @@ attributes:
weight: 40
type: "text"
regex:
source: '^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$'
source: '^(?!(?:0(?:\.0){3}|255(?:\.255){3}))(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:,\s*(?!(?:0(?:\.0){3}|255(?:\.255){3}))(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$'
error: "Invalid IP address list"
contrail_external:
value: '10.100.1.0/24'
@ -29,7 +29,7 @@ attributes:
weight: 50
type: "text"
regex:
source: '^(?:(?:[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}(?:[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\/([1-9]|[1-2]\d|3[0-2])$'
source: '^(?!(?:0(?:\.0){3}|255(?:\.255){3})$)(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}$'
error: "Invalid CIDR"
contrail_route_target:
value: '10000'
@ -88,7 +88,7 @@ attributes:
weight: 131
type: "text"
regex:
source: '0[xX][0-9a-fA-F]+'
source: '^0[xX][0-9a-fA-F]+$'
error: "Invalid hexadecimal value"
restrictions:
- condition: "not (settings:contrail.metadata.enabled == true and settings:contrail.contrail_global_dpdk.value == true)"