summaryrefslogtreecommitdiffstats
path: root/aai-core/src/test/resources
diff options
context:
space:
mode:
Diffstat (limited to 'aai-core/src/test/resources')
-rw-r--r--aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml6
-rw-r--r--aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json4
2 files changed, 5 insertions, 5 deletions
diff --git a/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml b/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml
index bf87893c..27f03332 100644
--- a/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml
+++ b/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml
@@ -4447,7 +4447,7 @@
</xml-element>
<xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
<xml-properties>
- <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+ <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
</xml-properties>
</xml-element>
<xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
@@ -4477,7 +4477,7 @@
</xml-element>
<xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
<xml-properties>
- <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+ <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
</xml-properties>
</xml-element>
<xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
@@ -5536,7 +5536,7 @@
</xml-element>
<xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
<xml-properties>
- <xml-property name="description" value="Design of zone [Medium/Large…]" />
+ <xml-property name="description" value="Design of zone [Medium/Large?]" />
</xml-properties>
</xml-element>
<xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
diff --git a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json b/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json
index 80d6560b..d90a71bc 100644
--- a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json
+++ b/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json
@@ -1,7 +1,7 @@
{
"results": [
{
- "url" : "/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-987654321-9922/cloud-region-id-987654321-9922/tenants/tenant/tenant-987654321-9999/vservers/vserver/vserver-987654321-9999",
+ "url" : "/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-987654321-9922-as988q/cloud-region-id-987654321-9922-as988q/tenants/tenant/tenant-987654321-9999-as988q/vservers/vserver/vserver-987654321-9999-as988q",
"vserver": {
}
@@ -13,4 +13,4 @@
}
}
]
-}
+} \ No newline at end of file