diff options
| author |   Hui Deng <denghui12@huawei.com> | 2018-11-28 22:40:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-28 22:40:47 +0000 |
| commit | ed1d0d4d3b14f82da317d59a6f01c018eb391357 (patch) | |
| tree | b0f37ca45fb102f90aa918cd7e780c8402fdeeb1 | |
| parent | 8e05bd6297d16ec29e5efb6938719687f4177576 (diff) | |
| parent | 2da7c541f0ab99699ec4ca55b06f0a96dd58ad2a (diff) | |
Merge "Added location attribute to PublicCloudRegion" into R3workingbranch
| -rw-r--r-- | papyrus/ONAP Information Model/Infrastructure.notation | 9 | ||||
| -rw-r--r-- | papyrus/ONAP Information Model/Infrastructure.uml | 11 |
2 files changed, 18 insertions, 2 deletions
diff --git a/papyrus/ONAP Information Model/Infrastructure.notation b/papyrus/ONAP Information Model/Infrastructure.notation index 01ceebd..b7bc3b1 100644 --- a/papyrus/ONAP Information Model/Infrastructure.notation +++ b/papyrus/ONAP Information Model/Infrastructure.notation @@ -19,6 +19,10 @@ <element xmi:type="uml:Property" href="Infrastructure.uml#_08h6cIUnEeim-78_quJkVw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_1DtggYUnEeim-78_quJkVw"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_cqcNYMvlEei4GNQcvybLaA" type="Property_ClassAttributeLabel">
+ <element xmi:type="uml:Property" href="Infrastructure.uml#_chr6AMvlEei4GNQcvybLaA"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_cqcNYcvlEei4GNQcvybLaA"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_Wy99UYUQEeiLZbToO90xEA"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_Wy99UoUQEeiLZbToO90xEA"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_Wy99U4UQEeiLZbToO90xEA"/>
@@ -282,7 +286,8 @@ </edges>
</notation:Diagram>
<css:ModelStyleSheets xmi:id="_VX3RQIUQEeiLZbToO90xEA">
- <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_VX4fYIUQEeiLZbToO90xEA" path="/onap-model/ONAP Information Model/StyleSheets/ClassDiagramStyleSheet.css"/>
+ <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_wuSysMvkEei4GNQcvybLaA" path="/ONAP Information Model/StyleSheets/ClassDiagramStyleSheet.css"/>
+ <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_B2qo4MvlEei4GNQcvybLaA" path="/ONAP Information Model/StyleSheets/CompartmentRestrictions.css"/>
</css:ModelStyleSheets>
<notation:Diagram xmi:id="_yJ-d0IUoEeim-78_quJkVw" type="PapyrusUMLClassDiagram" name="Enumerations" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_zZUl0IUoEeim-78_quJkVw" type="Enumeration_Shape">
@@ -345,7 +350,7 @@ <element xmi:type="uml:Enumeration" href="Infrastructure.uml#_mH7IkIUlEeim-78_quJkVw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_2ILYwYUoEeim-78_quJkVw" x="200" y="40"/>
</children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_yJ-d0YUoEeim-78_quJkVw" name="diagram_compatibility_version" stringValue="1.3.0"/>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_yJ-d0YUoEeim-78_quJkVw" name="diagram_compatibility_version" stringValue="1.4.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_yJ-d0oUoEeim-78_quJkVw"/>
<styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_yJ-d04UoEeim-78_quJkVw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
<owner xmi:type="uml:Package" href="Infrastructure.uml#_vDgtwDOHEei5Af8DcjrhIQ"/>
diff --git a/papyrus/ONAP Information Model/Infrastructure.uml b/papyrus/ONAP Information Model/Infrastructure.uml index 6be4e41..b5873be 100644 --- a/papyrus/ONAP Information Model/Infrastructure.uml +++ b/papyrus/ONAP Information Model/Infrastructure.uml @@ -82,6 +82,15 @@ Example, Microsoft Azure has regions "East US" and "East US 2&quo </ownedComment>
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_chr6AMvlEei4GNQcvybLaA" name="location">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_7Xa4EMvlEei4GNQcvybLaA" annotatedElement="_chr6AMvlEei4GNQcvybLaA">
+ <body>The city, and/or state or province, and country where the PublicCloudRegion is. Note that the public cloud providers typically at best provide a city name for where the PublicCloudRegion and its availability zones are located.
+E.g., Amazon AWS "US West" is in Northern California; "EU-West-2" is in London, "EU-West-3" is in Paris.
+E.g., Microsoft Azure "US Central" is in Iowa; "US East 2" is in Virginia; one has to search through non-Microsoft public records to find out that "US East 2" may be in Boydton, Virginia.
+</body>
+ </ownedComment>
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_bLcZcIUQEeiLZbToO90xEA" name="PublicCloudAvailabilityZone">
<ownedComment xmi:type="uml:Comment" xmi:id="_C1pnYIUdEeim-78_quJkVw" annotatedElement="_bLcZcIUQEeiLZbToO90xEA">
@@ -251,4 +260,6 @@ ONAP should provide a default list, that the ONAP operator can customize.
 <OpenModel_Profile:Experimental xmi:id="_dIxXEIU3Eeim-78_quJkVw" base_Element="_OMYjMIUqEeim-78_quJkVw"/>
<OpenModel_Profile:Experimental xmi:id="_f3jRgIU3Eeim-78_quJkVw" base_Element="_HLSK4IUdEeim-78_quJkVw"/>
<OpenModel_Profile:Experimental xmi:id="_hJk6EIU3Eeim-78_quJkVw" base_Element="_v2oWoIUyEeim-78_quJkVw"/>
+ <Onap_Profile:OnapModelLifecycle xmi:id="_cjU4wMvlEei4GNQcvybLaA" base_Property="_chr6AMvlEei4GNQcvybLaA"/>
+ <OpenModel_Profile:OpenModelAttribute xmi:id="_cjVf0MvlEei4GNQcvybLaA" base_StructuralFeature="_chr6AMvlEei4GNQcvybLaA"/>
</xmi:XMI>
|