projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1961 to allow IPv6 addresses besides IPv4 as instantiation param
[osm/NBI.git]
/
osm_nbi
/
validation.py
diff --git
a/osm_nbi/validation.py
b/osm_nbi/validation.py
index
fc16f06
..
d1cfc1d
100644
(file)
--- a/
osm_nbi/validation.py
+++ b/
osm_nbi/validation.py
@@
-157,7
+157,7
@@
ns_instantiate_vdu = {
"type": "object",
"properties": {
"name": name_schema,
"type": "object",
"properties": {
"name": name_schema,
- "ip-address":
ip_schema
,
+ "ip-address":
{"oneOf": [ip_schema, ipv6_schema]}
,
"mac-address": mac_schema,
"floating-ip-required": bool_schema,
},
"mac-address": mac_schema,
"floating-ip-required": bool_schema,
},
@@
-176,7
+176,7
@@
ip_profile_dns_schema = {
"items": {
"type": "object",
"properties": {
"items": {
"type": "object",
"properties": {
- "address":
ip_schema
,
+ "address":
{"oneOf": [ip_schema, ipv6_schema]}
,
},
"required": ["address"],
"additionalProperties": False,
},
"required": ["address"],
"additionalProperties": False,
@@
-246,7
+246,7
@@
provider_network_schema = {
}
ns_instantiate_internal_vld = {
}
ns_instantiate_internal_vld = {
- "title": "ns action instantiate input schema for v
du
",
+ "title": "ns action instantiate input schema for v
ld
",
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
@@
-391,7
+391,7
@@
ns_instantiate = {
"properties": {
"member-vnf-index-ref": name_schema,
"vnfd-connection-point-ref": name_schema,
"properties": {
"member-vnf-index-ref": name_schema,
"vnfd-connection-point-ref": name_schema,
- "ip-address":
ip_schema
,
+ "ip-address":
{"oneOf": [ip_schema, ipv6_schema]}
,
# "mac-address": mac_schema,
},
"required": [
# "mac-address": mac_schema,
},
"required": [