Merge "Add epaCaps and cloudExtraInfo to cloud-region."

diff --combined aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
index 956ee0a,cb85f5e..51f1ddf
--- 1/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
--- 2/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@@ -298,6 -298,16 +298,16 @@@
                                                <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." />
                                        </xml-properties>
                                </xml-element>
+                               <xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudEpaCaps" name="cloud-epa-caps" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." />
+                                       </xml-properties>
+                               </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
@@@ -4346,26 -4356,6 +4356,26 @@@
                                        <xml-properties>
                                                <xml-property name="description" value="Name of the service Provider on this link." />
                                        </xml-properties>
 +                              </xml-element>
 +                              <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
 +                                      <xml-properties>
 +                                              <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider" />
 +                                      </xml-properties>
 +                              </xml-element>
 +                              <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
 +                                      <xml-properties>
 +                                              <xml-property name="description" value="Units for the upstream BW value" />
 +                                      </xml-properties>
 +                              </xml-element>
 +                              <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
 +                                      <xml-properties>
 +                                              <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider" />
 +                                      </xml-properties>
 +                              </xml-element>
 +                              <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
 +                                      <xml-properties>
 +                                              <xml-property name="description" value="Units for downstream BW value" />
 +                                      </xml-properties>
                                </xml-element>                                  
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>