Code Review
/
aai
/
aai-common.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
8d980b7
)
Fix dependentOn for hpaCapability node
77/34877/2
author
Dileep Ranganathan
<dileep.ranganathan@intel.com>
Thu, 8 Mar 2018 18:35:17 +0000
(10:35 -0800)
committer
Dileep Ranganathan
<dileep.ranganathan@intel.com>
Fri, 9 Mar 2018 13:21:58 +0000
(
05:21
-0800)
Added cloud-region along with flavor in the dependentOn field.
Modified hpa-feature-attribute to hpa-feature-attributes as it is an arraylist.
Change-Id: I7b0c3ee6e08b3bea97a1ebaeeaa8bcaeb8bb2b00
Issue-ID: AAI-742
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
patch
|
blob
|
history
aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
patch
|
blob
|
history
aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
patch
|
blob
|
history
aai-schema/src/main/resources/oxm/aai_oxm_v13.xml
patch
|
blob
|
history
diff --git
a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
index
ed34d44
..
8ed9c93
100644
(file)
--- a/
aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
+++ b/
aai-core/src/main/resources/dbedgerules/DbEdgeRules_v12.json
@@
-307,6
+307,19
@@
"default": "true",
"description":""
},
"default": "true",
"description":""
},
+ {
+ "from": "hpa-feature-attributes",
+ "to": "hpa-capability",
+ "label": "org.onap.relationships.inventory.BelongsTo",
+ "direction": "OUT",
+ "multiplicity": "MANY2ONE",
+ "contains-other-v": "!${direction}",
+ "delete-other-v": "!${direction}",
+ "SVC-INFRA": "!${direction}",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":""
+ },
{
"from": "group-assignment",
"to": "cloud-region",
{
"from": "group-assignment",
"to": "cloud-region",
diff --git
a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
index
ed34d44
..
8ed9c93
100644
(file)
--- a/
aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
+++ b/
aai-core/src/main/resources/dbedgerules/DbEdgeRules_v13.json
@@
-307,6
+307,19
@@
"default": "true",
"description":""
},
"default": "true",
"description":""
},
+ {
+ "from": "hpa-feature-attributes",
+ "to": "hpa-capability",
+ "label": "org.onap.relationships.inventory.BelongsTo",
+ "direction": "OUT",
+ "multiplicity": "MANY2ONE",
+ "contains-other-v": "!${direction}",
+ "delete-other-v": "!${direction}",
+ "SVC-INFRA": "!${direction}",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":""
+ },
{
"from": "group-assignment",
"to": "cloud-region",
{
"from": "group-assignment",
"to": "cloud-region",
diff --git
a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
index
196d00f
..
805d500
100644
(file)
--- a/
aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
+++ b/
aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
@@
-1,7
+1,7
@@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
============LICENSE_START=======================================================
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
============LICENSE_START=======================================================
- org.o
penecom
p.aai
+ org.o
na
p.aai
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
@@
-529,18
+529,18
@@
</xml-properties>
</xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
</xml-properties>
</xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v12.RelationshipList"/>
- <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttribute
" name="hpa-feature-attribute" type="inventory.aai.onap.org.v12.HpaFeatureAttribute
"/>
+ <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttribute
s" name="hpa-feature-attributes" type="inventory.aai.onap.org.v12.HpaFeatureAttributes
"/>
</java-attributes>
<xml-properties>
<xml-property name="description" value="Represents a HPA capability"/>
<xml-property name="indexedProps" value="hpa-feature,hpa-hw-arch,hpa-capability-id"/>
</java-attributes>
<xml-properties>
<xml-property name="description" value="Represents a HPA capability"/>
<xml-property name="indexedProps" value="hpa-feature,hpa-hw-arch,hpa-capability-id"/>
- <xml-property name="dependentOn" value="flavor"/>
+ <xml-property name="dependentOn" value="flavor
,cloud-region
"/>
<xml-property name="container" value="hpa-capabilities"/>
</xml-properties>
</java-type>
<xml-property name="container" value="hpa-capabilities"/>
</xml-properties>
</java-type>
- <java-type name="HpaFeatureAttribute">
- <xml-root-element name="hpa-feature-attribute"/>
+ <java-type name="HpaFeatureAttribute
s
">
+ <xml-root-element name="hpa-feature-attribute
s
"/>
<java-attributes>
<xml-element java-attribute="hpaAttributeKey" name="hpa-attr-key" type="java.lang.String">
<xml-properties>
<java-attributes>
<xml-element java-attribute="hpaAttributeKey" name="hpa-attr-key" type="java.lang.String">
<xml-properties>
diff --git
a/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml
b/aai-schema/src/main/resources/oxm/aai_oxm_v13.xml
index
9c4272b
..
96f2227
100644
(file)
--- a/
aai-schema/src/main/resources/oxm/aai_oxm_v13.xml
+++ b/
aai-schema/src/main/resources/oxm/aai_oxm_v13.xml
@@
-1,7
+1,7
@@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
============LICENSE_START=======================================================
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
============LICENSE_START=======================================================
- org.o
penecom
p.aai
+ org.o
na
p.aai
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
@@
-529,18
+529,18
@@
</xml-properties>
</xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
</xml-properties>
</xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
- <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttribute
" name="hpa-feature-attribute" type="inventory.aai.onap.org.v13.HpaFeatureAttribute
"/>
+ <xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttribute
s" name="hpa-feature-attributes" type="inventory.aai.onap.org.v13.HpaFeatureAttributes
"/>
</java-attributes>
<xml-properties>
<xml-property name="description" value="Represents a HPA capability"/>
<xml-property name="indexedProps" value="hpa-feature,hpa-hw-arch,hpa-capability-id"/>
</java-attributes>
<xml-properties>
<xml-property name="description" value="Represents a HPA capability"/>
<xml-property name="indexedProps" value="hpa-feature,hpa-hw-arch,hpa-capability-id"/>
- <xml-property name="dependentOn" value="flavor"/>
+ <xml-property name="dependentOn" value="flavor
,cloud-region
"/>
<xml-property name="container" value="hpa-capabilities"/>
</xml-properties>
</java-type>
<xml-property name="container" value="hpa-capabilities"/>
</xml-properties>
</java-type>
- <java-type name="HpaFeatureAttribute">
- <xml-root-element name="hpa-feature-attribute"/>
+ <java-type name="HpaFeatureAttribute
s
">
+ <xml-root-element name="hpa-feature-attribute
s
"/>
<java-attributes>
<xml-element java-attribute="hpaAttributeKey" name="hpa-attr-key" type="java.lang.String">
<xml-properties>
<java-attributes>
<xml-element java-attribute="hpaAttributeKey" name="hpa-attr-key" type="java.lang.String">
<xml-properties>