Update the license for 2017-2018 license

author Kajur, Harish (vk250x) <vk250x@att.com>

Wed, 21 Mar 2018 13:14:41 +0000 (09:14 -0400)

committer Kajur, Harish (vk250x) <vk250x@att.com>

Thu, 22 Mar 2018 05:16:47 +0000 (01:16 -0400)
author Kajur, Harish (vk250x) <vk250x@att.com>
Wed, 21 Mar 2018 13:14:41 +0000 (09:14 -0400)
committer Kajur, Harish (vk250x) <vk250x@att.com>
Thu, 22 Mar 2018 05:16:47 +0000 (01:16 -0400)
diff --git a/LICENSE.TXT b/LICENSE.TXT

index 72b8cfb..3455862 100644 (file)
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,7 +1,7 @@
  ============LICENSE_START=======================================================
  org.onap.aai
  ================================================================================
-Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  ================================================================================
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -15,5 +15,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  ============LICENSE_END=========================================================
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
diff --git a/aai-annotations/LICENSE.TXT b/aai-annotations/LICENSE.TXT

index 72b8cfb..3455862 100644 (file)
--- a/aai-annotations/LICENSE.TXT
+++ b/aai-annotations/LICENSE.TXT
@@ -1,7 +1,7 @@
  ============LICENSE_START=======================================================
  org.onap.aai
  ================================================================================
-Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  ================================================================================
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -15,5 +15,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  ============LICENSE_END=========================================================
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml

index 7362005..1b617c9 100644 (file)
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -1,4 +1,25 @@
  <?xml version="1.0"?>
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
  <project
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/aai-annotations/src/main/java/org/onap/aai/annotations/Metadata.java b/aai-annotations/src/main/java/org/onap/aai/annotations/Metadata.java

index e58515f..970319a 100644 (file)
--- a/aai-annotations/src/main/java/org/onap/aai/annotations/Metadata.java
+++ b/aai-annotations/src/main/java/org/onap/aai/annotations/Metadata.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.annotations;
  
diff --git a/aai-annotations/src/test/java/org/onap/aai/annotations/AnnotationsTest.java b/aai-annotations/src/test/java/org/onap/aai/annotations/AnnotationsTest.java

index e2763c0..0155278 100644 (file)
--- a/aai-annotations/src/test/java/org/onap/aai/annotations/AnnotationsTest.java
+++ b/aai-annotations/src/test/java/org/onap/aai/annotations/AnnotationsTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.annotations;
  
diff --git a/aai-utils/License.txt b/aai-auth/LICENSE.TXT

similarity index 86%

rename from aai-utils/License.txt

rename to aai-auth/LICENSE.TXT

index cdf6f18..eb76ea4 100644 (file)
--- a/aai-utils/License.txt
+++ b/aai-auth/LICENSE.TXT
@@ -1,9 +1,8 @@
  ============LICENSE_START=======================================================
  org.onap.aai
  ================================================================================
-Copyright © 2017 AT&T Intellectual Property.
+Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  Copyright © 2017 Amdocs
-All rights reserved.
  ================================================================================
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -17,5 +16,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  ============LICENSE_END=========================================================
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml

index 1a6190d..902ec7f 100644 (file)
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -1,3 +1,25 @@
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+    Copyright © 2017-2018 Amdocs
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
@@ -36,21 +58,6 @@
              <plugin>
                  <groupId>com.mycila</groupId>
                  <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>License.txt</header>
-                    <includes>
-                        <include>src/main/java/**</include>
-                    </includes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
              </plugin>
  
  
diff --git a/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java b/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java

index 2a4a753..8f9b03d 100644 (file)
--- a/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java
+++ b/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java
@@ -1,10 +1,9 @@
  /**
   * ============LICENSE_START=======================================================
- * EcompAuth
+ * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
   * Copyright © 2017 Amdocs
- * All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -18,9 +17,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
   */
  package org.onap.aaiauth.auth;
  
diff --git a/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java b/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java

index a9d4ad5..2e9424c 100644 (file)
--- a/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java
+++ b/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java
@@ -1,10 +1,9 @@
  /**
   * ============LICENSE_START=======================================================
- * EcompAuth
+ * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
   * Copyright © 2017 Amdocs
- * All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -18,9 +17,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
   */
  package org.onap.aaiauth.auth;
  
diff --git a/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java b/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java

index 9d8786c..15f8eba 100644 (file)
--- a/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java
+++ b/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java
@@ -1,10 +1,9 @@
  /**
   * ============LICENSE_START=======================================================
- * EcompAuth
+ * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
   * Copyright © 2017 Amdocs
- * All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -18,9 +17,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
   */
  package org.onap.aaiauth.util;
  
diff --git a/aai-client-loadbalancer/LICENSE.TXT b/aai-client-loadbalancer/LICENSE.TXT

new file mode 100644 (file)

index 0000000..3455862
--- /dev/null
+++ b/aai-client-loadbalancer/LICENSE.TXT
@@ -0,0 +1,17 @@
+============LICENSE_START=======================================================
+org.onap.aai
+================================================================================
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
diff --git a/aai-client-loadbalancer/pom.xml b/aai-client-loadbalancer/pom.xml

index 3a10037..f819c42 100644 (file)
--- a/aai-client-loadbalancer/pom.xml
+++ b/aai-client-loadbalancer/pom.xml
@@ -1,3 +1,24 @@
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
diff --git a/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java b/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java

index 4c639e4..601c873 100644 (file)
--- a/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java
+++ b/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai;
  
diff --git a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java b/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java

index 4ecbfb6..fcda074 100644 (file)
--- a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java
+++ b/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.config;
  
diff --git a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java b/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java

index 2e5804e..dd19801 100644 (file)
--- a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java
+++ b/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.config;
  
diff --git a/aai-core/LICENSE.TXT b/aai-core/LICENSE.TXT

index 72b8cfb..3455862 100644 (file)
--- a/aai-core/LICENSE.TXT
+++ b/aai-core/LICENSE.TXT
@@ -1,7 +1,7 @@
  ============LICENSE_START=======================================================
  org.onap.aai
  ================================================================================
-Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  ================================================================================
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -15,5 +15,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  ============LICENSE_END=========================================================
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
diff --git a/aai-core/pom.xml b/aai-core/pom.xml

index 6e525a7..fc65876 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -1,4 +1,25 @@
  <?xml version="1.0"?>
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
  <project
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/aai-core/src/main/java/org/onap/aai/audit/ListEndpoints.java b/aai-core/src/main/java/org/onap/aai/audit/ListEndpoints.java

index bfa8748..310655f 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/audit/ListEndpoints.java
+++ b/aai-core/src/main/java/org/onap/aai/audit/ListEndpoints.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.audit;
  
diff --git a/aai-core/src/main/java/org/onap/aai/auth/exceptions/AAIUnrecognizedFunctionException.java b/aai-core/src/main/java/org/onap/aai/auth/exceptions/AAIUnrecognizedFunctionException.java

index 9758f98..c77fbfe 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/auth/exceptions/AAIUnrecognizedFunctionException.java
+++ b/aai-core/src/main/java/org/onap/aai/auth/exceptions/AAIUnrecognizedFunctionException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.auth.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/config/DmaapConfig.java b/aai-core/src/main/java/org/onap/aai/config/DmaapConfig.java

index 313775d..29fac33 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/config/DmaapConfig.java
+++ b/aai-core/src/main/java/org/onap/aai/config/DmaapConfig.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.config;
  
diff --git a/aai-core/src/main/java/org/onap/aai/config/SpringContextAware.java b/aai-core/src/main/java/org/onap/aai/config/SpringContextAware.java

index 4ab9373..db8de9e 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/config/SpringContextAware.java
+++ b/aai-core/src/main/java/org/onap/aai/config/SpringContextAware.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.config;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/DbMethHelper.java b/aai-core/src/main/java/org/onap/aai/db/DbMethHelper.java

index a3e4d71..9a73f0f 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/DbMethHelper.java
+++ b/aai-core/src/main/java/org/onap/aai/db/DbMethHelper.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java b/aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java

index 0acb228..e1de3ff 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java
+++ b/aai-core/src/main/java/org/onap/aai/db/props/AAIProperties.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.props;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/AuditDoc.java b/aai-core/src/main/java/org/onap/aai/db/schema/AuditDoc.java

index dc92b22..078f063 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/AuditDoc.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/AuditDoc.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java b/aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java

index 5ebfeb2..ff7eee2 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/AuditOXM.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/AuditTitan.java b/aai-core/src/main/java/org/onap/aai/db/schema/AuditTitan.java

index ec1c239..03c0f9a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/AuditTitan.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/AuditTitan.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/Auditor.java b/aai-core/src/main/java/org/onap/aai/db/schema/Auditor.java

index 3e7a595..5dc8c6c 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/Auditor.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/Auditor.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/AuditorFactory.java b/aai-core/src/main/java/org/onap/aai/db/schema/AuditorFactory.java

index 9af7a11..f47807b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/AuditorFactory.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/AuditorFactory.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/CompareByName.java b/aai-core/src/main/java/org/onap/aai/db/schema/CompareByName.java

index 56fe1a4..829239d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/CompareByName.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/CompareByName.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/DBIndex.java b/aai-core/src/main/java/org/onap/aai/db/schema/DBIndex.java

index 9093a20..f0e3ee6 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/DBIndex.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/DBIndex.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/DBProperty.java b/aai-core/src/main/java/org/onap/aai/db/schema/DBProperty.java

index e4f98cb..29aef8e 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/DBProperty.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/DBProperty.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/EdgeProperty.java b/aai-core/src/main/java/org/onap/aai/db/schema/EdgeProperty.java

index 4d0cf3b..f0de765 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/EdgeProperty.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/EdgeProperty.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/ManageTitanSchema.java b/aai-core/src/main/java/org/onap/aai/db/schema/ManageTitanSchema.java

index 9af65c7..c696d88 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/ManageTitanSchema.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/ManageTitanSchema.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/Named.java b/aai-core/src/main/java/org/onap/aai/db/schema/Named.java

index 4f1f9e6..f12699b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/Named.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/Named.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/db/schema/ScriptDriver.java b/aai-core/src/main/java/org/onap/aai/db/schema/ScriptDriver.java

index 968d9ef..7385ea5 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/db/schema/ScriptDriver.java
+++ b/aai-core/src/main/java/org/onap/aai/db/schema/ScriptDriver.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.db.schema;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dbgen/DataGrooming.java b/aai-core/src/main/java/org/onap/aai/dbgen/DataGrooming.java

index f7b9d86..ce820f6 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dbgen/DataGrooming.java
+++ b/aai-core/src/main/java/org/onap/aai/dbgen/DataGrooming.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dbgen;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java b/aai-core/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java

index 52fc8f1..cd6838c 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
+++ b/aai-core/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dbgen;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dbgen/GenTester.java b/aai-core/src/main/java/org/onap/aai/dbgen/GenTester.java

index 8167294..174b157 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dbgen/GenTester.java
+++ b/aai-core/src/main/java/org/onap/aai/dbgen/GenTester.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dbgen;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dbgen/PropertyLimitDesc.java b/aai-core/src/main/java/org/onap/aai/dbgen/PropertyLimitDesc.java

index b71e7ba..2a1a4c0 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dbgen/PropertyLimitDesc.java
+++ b/aai-core/src/main/java/org/onap/aai/dbgen/PropertyLimitDesc.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dbgen;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.java b/aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.java

index e26ba2c..c8b3df5 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.java
+++ b/aai-core/src/main/java/org/onap/aai/dbgen/SchemaGenerator.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dbgen;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.java b/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.java

index 5c7abfe..46fc2c6 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.java
+++ b/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dbmap;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraphConfig.java b/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraphConfig.java

index e67051f..59a1453 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraphConfig.java
+++ b/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraphConfig.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.dbmap;
  
  import com.att.eelf.configuration.EELFLogger;
diff --git a/aai-core/src/main/java/org/onap/aai/dbmap/DBConnectionType.java b/aai-core/src/main/java/org/onap/aai/dbmap/DBConnectionType.java

index 6095c86..f0b6c14 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dbmap/DBConnectionType.java
+++ b/aai-core/src/main/java/org/onap/aai/dbmap/DBConnectionType.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dbmap;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dbmap/InMemoryGraph.java b/aai-core/src/main/java/org/onap/aai/dbmap/InMemoryGraph.java

index 61b4e36..e5d4c2e 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dbmap/InMemoryGraph.java
+++ b/aai-core/src/main/java/org/onap/aai/dbmap/InMemoryGraph.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dbmap;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java

index e52cc3e..cc3afa6 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java
+++ b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dmaap;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSProducer.java b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSProducer.java

index a034b9f..dc803b1 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSProducer.java
+++ b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSProducer.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dmaap;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dmaap/JMSConsumer.java b/aai-core/src/main/java/org/onap/aai/dmaap/JMSConsumer.java

index b763887..1609286 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dmaap/JMSConsumer.java
+++ b/aai-core/src/main/java/org/onap/aai/dmaap/JMSConsumer.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dmaap;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dmaap/JMSProducer.java b/aai-core/src/main/java/org/onap/aai/dmaap/JMSProducer.java

index 6dbfbb7..6ddb141 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dmaap/JMSProducer.java
+++ b/aai-core/src/main/java/org/onap/aai/dmaap/JMSProducer.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dmaap;
  
diff --git a/aai-core/src/main/java/org/onap/aai/dmaap/MessageProducer.java b/aai-core/src/main/java/org/onap/aai/dmaap/MessageProducer.java

index 229ba1a..c7edfd2 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/dmaap/MessageProducer.java
+++ b/aai-core/src/main/java/org/onap/aai/dmaap/MessageProducer.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.dmaap;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java

index 311b857..15044dc 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  //
  // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
diff --git a/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java

index 7c456fb..84f1920 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  //
  // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.java

index 03a31ff..490666c 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.responseMessage;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java

index 5c33b93..49fb0c1 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.responseMessage;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.java

index 3830ce7..00ed166 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.responseMessage;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.java

index 7e5fb68..d4ea565 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.responseMessage;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java

index 43e9842..e305196 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  //
  // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/Fault.java b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/Fault.java

index dd93709..f84d441 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/Fault.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/Fault.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  //
  // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/ObjectFactory.java b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/ObjectFactory.java

index ba09fa7..1cde487 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/ObjectFactory.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/ObjectFactory.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  //
  // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/PolicyException.java b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/PolicyException.java

index 3f8d764..b6e0d2e 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/PolicyException.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/PolicyException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.restPolicyException;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RESTResponse.java b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RESTResponse.java

index df4a86b..e6f98bc 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RESTResponse.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RESTResponse.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.restPolicyException;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RequestError.java b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RequestError.java

index e210341..3624516 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RequestError.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restPolicyException/RequestError.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.restPolicyException;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/Info.java b/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/Info.java

index 4ef131a..aec2ffb 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/Info.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/Info.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  //
  // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/ObjectFactory.java b/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/ObjectFactory.java

index 461e7f0..6d6ddd0 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/ObjectFactory.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restResponseInfo/ObjectFactory.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  //
  // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restServiceException/Fault.java b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/Fault.java

index 2032cc5..0f7cc48 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restServiceException/Fault.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/Fault.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  //
  // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ObjectFactory.java b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ObjectFactory.java

index 6aef298..39581f3 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ObjectFactory.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ObjectFactory.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  //
  // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RESTResponse.java b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RESTResponse.java

index c571fd1..0a6ee1c 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RESTResponse.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RESTResponse.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.restServiceException;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RequestError.java b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RequestError.java

index 00b5983..bf22077 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RequestError.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/RequestError.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.restServiceException;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ServiceException.java b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ServiceException.java

index 0b392a0..10f136b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ServiceException.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/restServiceException/ServiceException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.restServiceException;
  
diff --git a/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java

index cbd39c3..ae184d9 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  //
  // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
diff --git a/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.java b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.java

index 37905a4..843afb2 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.java
+++ b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.domain.translog;
  
diff --git a/aai-core/src/main/java/org/onap/aai/exceptions/AAIException.java b/aai-core/src/main/java/org/onap/aai/exceptions/AAIException.java

index 349013b..375e00f 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/exceptions/AAIException.java
+++ b/aai-core/src/main/java/org/onap/aai/exceptions/AAIException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/exceptions/AAIExceptionWithInfo.java b/aai-core/src/main/java/org/onap/aai/exceptions/AAIExceptionWithInfo.java

index 992c698..3a75ee9 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/exceptions/AAIExceptionWithInfo.java
+++ b/aai-core/src/main/java/org/onap/aai/exceptions/AAIExceptionWithInfo.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/extensions/AAIExtensionMap.java b/aai-core/src/main/java/org/onap/aai/extensions/AAIExtensionMap.java

index 3d7969e..eff781c 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/extensions/AAIExtensionMap.java
+++ b/aai-core/src/main/java/org/onap/aai/extensions/AAIExtensionMap.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.extensions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/extensions/ExtensionController.java b/aai-core/src/main/java/org/onap/aai/extensions/ExtensionController.java

index 2ec3056..8959a04 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/extensions/ExtensionController.java
+++ b/aai-core/src/main/java/org/onap/aai/extensions/ExtensionController.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.extensions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/extensions/OrphanLInterfaceHandler.java b/aai-core/src/main/java/org/onap/aai/extensions/OrphanLInterfaceHandler.java

index 3da4e22..7a14a24 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/extensions/OrphanLInterfaceHandler.java
+++ b/aai-core/src/main/java/org/onap/aai/extensions/OrphanLInterfaceHandler.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.extensions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/ingestModel/CreateWidgetModels.java b/aai-core/src/main/java/org/onap/aai/ingestModel/CreateWidgetModels.java

index 98b0dc4..2c13799 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/ingestModel/CreateWidgetModels.java
+++ b/aai-core/src/main/java/org/onap/aai/ingestModel/CreateWidgetModels.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.ingestModel;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/Introspector.java b/aai-core/src/main/java/org/onap/aai/introspection/Introspector.java

index 16680a8..7072121 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/Introspector.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/Introspector.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorFactory.java b/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorFactory.java

index 801905d..4bcbd1d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorFactory.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorFactory.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorWalker.java b/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorWalker.java

index e939b6d..e406b0a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorWalker.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/IntrospectorWalker.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java b/aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java

index d36e39b..09ff7d3 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/Loader.java b/aai-core/src/main/java/org/onap/aai/introspection/Loader.java

index 579a464..ea323c5 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/Loader.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/Loader.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.java b/aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.java

index 63f9553..12255d8 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/LoaderFactory.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/MarshallerProperties.java b/aai-core/src/main/java/org/onap/aai/introspection/MarshallerProperties.java

index 7f0251f..2824dbb 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/MarshallerProperties.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/MarshallerProperties.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/ModelInjestor.java b/aai-core/src/main/java/org/onap/aai/introspection/ModelInjestor.java

index 524dcbf..788500a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/ModelInjestor.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/ModelInjestor.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/ModelType.java b/aai-core/src/main/java/org/onap/aai/introspection/ModelType.java

index 49d2c90..2554c54 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/ModelType.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/ModelType.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/MoxyLoader.java b/aai-core/src/main/java/org/onap/aai/introspection/MoxyLoader.java

index a2a673e..63b9a12 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/MoxyLoader.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/MoxyLoader.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.java b/aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.java

index 235df0c..05d4bca 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/PojoInjestor.java b/aai-core/src/main/java/org/onap/aai/introspection/PojoInjestor.java

index 4a805d4..3f009df 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/PojoInjestor.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/PojoInjestor.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/PojoLoader.java b/aai-core/src/main/java/org/onap/aai/introspection/PojoLoader.java

index 8841147..c471c7f 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/PojoLoader.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/PojoLoader.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/PojoStrategy.java b/aai-core/src/main/java/org/onap/aai/introspection/PojoStrategy.java

index 9a8c448..487bc40 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/PojoStrategy.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/PojoStrategy.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicate.java b/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicate.java

index f4f666d..1682e51 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicate.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicate.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicates.java b/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicates.java

index 90edd5e..e80bf43 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicates.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/PropertyPredicates.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/Version.java b/aai-core/src/main/java/org/onap/aai/introspection/Version.java

index a3ff9d0..76ff939 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/Version.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/Version.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/Visibility.java b/aai-core/src/main/java/org/onap/aai/introspection/Visibility.java

index 4e5b6b7..71971c8 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/Visibility.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/Visibility.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/Wanderer.java b/aai-core/src/main/java/org/onap/aai/introspection/Wanderer.java

index 156de4f..d97bd2d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/Wanderer.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/Wanderer.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java

index 6bc5355..4086b3c 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java

index bf9c7a3..2eb3dad 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/generator/CreateExample.java b/aai-core/src/main/java/org/onap/aai/introspection/generator/CreateExample.java

index 4d11c9a..3409d17 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/generator/CreateExample.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/generator/CreateExample.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.generator;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java

index d002f06..8a8d74f 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.sideeffect;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java

index 2038720..7a35910 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.sideeffect;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java

index f98e07c..1c15c8b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.sideeffect;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java

index 0852060..d279a4a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffect.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.sideeffect;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunner.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunner.java

index 0129b99..8636084 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunner.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunner.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.sideeffect;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunnerHelper.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunnerHelper.java

index f73216c..4daefe4 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunnerHelper.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/SideEffectRunnerHelper.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.sideeffect;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java

index c159c80..ac9abbe 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.sideeffect.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java

index d9be4d5..dc4be81 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.sideeffect.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/tools/CreateUUID.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/CreateUUID.java

index a061ad6..4652c8f 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/tools/CreateUUID.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/CreateUUID.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.tools;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/tools/DefaultFields.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/DefaultFields.java

index fdf45a1..cb7b503 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/tools/DefaultFields.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/DefaultFields.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.tools;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/tools/InjectKeysFromURI.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/InjectKeysFromURI.java

index f109a62..114cd67 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/tools/InjectKeysFromURI.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/InjectKeysFromURI.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.tools;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/tools/IntrospectorValidator.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/IntrospectorValidator.java

index b4878e3..c6d31c2 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/tools/IntrospectorValidator.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/IntrospectorValidator.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.tools;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/tools/Issue.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/Issue.java

index 54bc393..73ab232 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/tools/Issue.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/Issue.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.tools;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueResolver.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueResolver.java

index c5a6bc2..b47d753 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueResolver.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueResolver.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.tools;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueType.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueType.java

index c532c5f..5151617 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueType.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/IssueType.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.tools;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/tools/RemoveNonVisibleProperty.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/RemoveNonVisibleProperty.java

index f15df84..07fff1b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/tools/RemoveNonVisibleProperty.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/RemoveNonVisibleProperty.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.tools;
  
diff --git a/aai-core/src/main/java/org/onap/aai/introspection/tools/Severity.java b/aai-core/src/main/java/org/onap/aai/introspection/tools/Severity.java

index ab3d1aa..5e48bcc 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/tools/Severity.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/tools/Severity.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.tools;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/CNName.java b/aai-core/src/main/java/org/onap/aai/logging/CNName.java

index de5e99e..1a60af1 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/CNName.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/CNName.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayout.java b/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayout.java

index a0b265b..ee7b4ef 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayout.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayout.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayoutEncoder.java b/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayoutEncoder.java

index 57f7347..0f474ee 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayoutEncoder.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/CustomLogPatternLayoutEncoder.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/DME2RestFlag.java b/aai-core/src/main/java/org/onap/aai/logging/DME2RestFlag.java

index 16633d5..86c2526 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/DME2RestFlag.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/DME2RestFlag.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/EcompElapsedTime.java b/aai-core/src/main/java/org/onap/aai/logging/EcompElapsedTime.java

index 6025ba9..f6c89b9 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/EcompElapsedTime.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/EcompElapsedTime.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/EcompEncoder.java b/aai-core/src/main/java/org/onap/aai/logging/EcompEncoder.java

index e10ad4d..18a8425 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/EcompEncoder.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/EcompEncoder.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/EcompErrorCategory.java b/aai-core/src/main/java/org/onap/aai/logging/EcompErrorCategory.java

index 9bf4056..48c87c5 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/EcompErrorCategory.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/EcompErrorCategory.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/EcompPatternLayout.java b/aai-core/src/main/java/org/onap/aai/logging/EcompPatternLayout.java

index b0eba74..88506ee 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/EcompPatternLayout.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/EcompPatternLayout.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/EcompResponseCode.java b/aai-core/src/main/java/org/onap/aai/logging/EcompResponseCode.java

index af3fdb7..b57c665 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/EcompResponseCode.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/EcompResponseCode.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/EcompResponseDescription.java b/aai-core/src/main/java/org/onap/aai/logging/EcompResponseDescription.java

index 6ef4b75..eb11c16 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/EcompResponseDescription.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/EcompResponseDescription.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/EcompStartTime.java b/aai-core/src/main/java/org/onap/aai/logging/EcompStartTime.java

index e0594cf..ef383af 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/EcompStartTime.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/EcompStartTime.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/EelfClassOfCaller.java b/aai-core/src/main/java/org/onap/aai/logging/EelfClassOfCaller.java

index 4450be3..cb84ba9 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/EelfClassOfCaller.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/EelfClassOfCaller.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/ErrorLogHelper.java b/aai-core/src/main/java/org/onap/aai/logging/ErrorLogHelper.java

index a585a4a..0636281 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/ErrorLogHelper.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/ErrorLogHelper.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/ErrorObject.java b/aai-core/src/main/java/org/onap/aai/logging/ErrorObject.java

index a1bca90..c15fed3 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/ErrorObject.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/ErrorObject.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.java b/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.java

index 2d34663..f9a640b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.java b/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.java

index 524ee18..b279d6b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/LogFormatTools.java b/aai-core/src/main/java/org/onap/aai/logging/LogFormatTools.java

index 19650b6..482b445 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/LogFormatTools.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/LogFormatTools.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/LoggingContext.java b/aai-core/src/main/java/org/onap/aai/logging/LoggingContext.java

index cb31bdd..8b8cb17 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/LoggingContext.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/LoggingContext.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.java b/aai-core/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.java

index 1944b06..fab59fc 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/StopWatch.java b/aai-core/src/main/java/org/onap/aai/logging/StopWatch.java

index 4b05f1a..e305062 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/StopWatch.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/StopWatch.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.java b/aai-core/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.java

index d063ef6..b1ee5de 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.java
+++ b/aai-core/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java

index 03b5695..4693840 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java

index f388aaa..7ee494a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java

index adf28f3..88cdc47 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java

index 10530d1..c99b842 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/ObjectNameQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/ObjectNameQueryParser.java

index ce85325..2979022 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/query/ObjectNameQueryParser.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/query/ObjectNameQueryParser.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  /**
   * 
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.java

index 845b49c..c791769 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParser.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.java b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.java

index e8ee099..e8ff60b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/RelationshipQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/RelationshipQueryParser.java

index 5943f3c..cdc0b1a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/query/RelationshipQueryParser.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/query/RelationshipQueryParser.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.java b/aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.java

index 09f3cb8..64f8eeb 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueRelationshipQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueRelationshipQueryParser.java

index 10566cc..f7f2705 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueRelationshipQueryParser.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueRelationshipQueryParser.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.java b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.java

index cc300fb..5712158 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java

index 1d63f6e..8517d45 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java b/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java

index 69e44a9..b78a95c 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.relationship;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java

index 3c8697e..aa2db5b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java

index 5480b49..2ce198e 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java

index 1df39b3..4dbac7f 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java

index 868a742..ad8a30a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java

index 6d5d98a..f145612 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java

index 48a6324..6acf8e5 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java

index 8371fc8..12b6aea 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java
+++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java

index c1518e2..85b484a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java
+++ b/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.java

index d87dac4..55faa4d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.java
+++ b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.java b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.java

index b3d3f75..b24c7af 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.java
+++ b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.java b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.java

index 85bd7ab..da01d2d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.java
+++ b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/MissingOptionalParameter.java b/aai-core/src/main/java/org/onap/aai/query/builder/MissingOptionalParameter.java

index b2d3205..8ce71e9 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/query/builder/MissingOptionalParameter.java
+++ b/aai-core/src/main/java/org/onap/aai/query/builder/MissingOptionalParameter.java
@@ -1,3 +1,22 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
  package org.onap.aai.query.builder;
  
  /*-
diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.java

index a51f592..89c15f2 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.java
+++ b/aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.java b/aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.java

index 014ce79..677f658 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.java
+++ b/aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/main/java/org/onap/aai/rest/RestHandlerService.java b/aai-core/src/main/java/org/onap/aai/rest/RestHandlerService.java

index 9c037b3..69525e2 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/rest/RestHandlerService.java
+++ b/aai-core/src/main/java/org/onap/aai/rest/RestHandlerService.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest;
  
diff --git a/aai-core/src/main/java/org/onap/aai/rest/RestTokens.java b/aai-core/src/main/java/org/onap/aai/rest/RestTokens.java

index d6e1802..d1c4d86 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/rest/RestTokens.java
+++ b/aai-core/src/main/java/org/onap/aai/rest/RestTokens.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest;
  
diff --git a/aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.java b/aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.java

index 66edf15..c378ae7 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.java
+++ b/aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java b/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java

index d6bf362..67b46bf 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java
+++ b/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/rest/ueb/NotificationEvent.java b/aai-core/src/main/java/org/onap/aai/rest/ueb/NotificationEvent.java

index 00678fb..5be7818 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/rest/ueb/NotificationEvent.java
+++ b/aai-core/src/main/java/org/onap/aai/rest/ueb/NotificationEvent.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest.ueb;
  
diff --git a/aai-core/src/main/java/org/onap/aai/rest/ueb/UEBNotification.java b/aai-core/src/main/java/org/onap/aai/rest/ueb/UEBNotification.java

index 26d029f..d05b212 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/rest/ueb/UEBNotification.java
+++ b/aai-core/src/main/java/org/onap/aai/rest/ueb/UEBNotification.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest.ueb;
  
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.java b/aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.java

index 9072323..44bcb8a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.restcore;
  
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/HttpMethod.java b/aai-core/src/main/java/org/onap/aai/restcore/HttpMethod.java

index e7c8d21..85c7dfa 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/restcore/HttpMethod.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/HttpMethod.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.restcore;
  
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.java b/aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.java

index 920a85a..b4d0424 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/JettyObfuscationConversionCommandLineUtil.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.restcore;
  
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/MediaType.java b/aai-core/src/main/java/org/onap/aai/restcore/MediaType.java

index 89be23e..66344a6 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/restcore/MediaType.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/MediaType.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.restcore;
  
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.java b/aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.java

index 9f13096..1b3796e 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.restcore;
  
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/search/GremlinGroovyShellSingleton.java b/aai-core/src/main/java/org/onap/aai/restcore/search/GremlinGroovyShellSingleton.java

index 7eb600d..521a5be 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/restcore/search/GremlinGroovyShellSingleton.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/search/GremlinGroovyShellSingleton.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.restcore.search;
  
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/util/EdgeRuleBean.java b/aai-core/src/main/java/org/onap/aai/restcore/util/EdgeRuleBean.java

index cd175e3..69332f3 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/restcore/util/EdgeRuleBean.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/util/EdgeRuleBean.java
@@ -1,14 +1,14 @@
-/*-
+/**
   * ============LICENSE_START=======================================================
- * org.openecomp.aai
+ * org.onap.aai
   * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,6 @@
   * limitations under the License.
   * ============LICENSE_END=========================================================
   */
-
  package org.onap.aai.restcore.util;
  
  public class EdgeRuleBean {
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/util/GenerateEdgeRules.java b/aai-core/src/main/java/org/onap/aai/restcore/util/GenerateEdgeRules.java

index e1660ab..afbcf33 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/restcore/util/GenerateEdgeRules.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/util/GenerateEdgeRules.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.restcore.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java b/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java

index 9889a56..8e8af55 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java
+++ b/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.restcore.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/AAIDirection.java b/aai-core/src/main/java/org/onap/aai/serialization/db/AAIDirection.java

index 1dce588..0a2b1ab 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/AAIDirection.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/AAIDirection.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java b/aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java

index 8e1bf96..9b57e48 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/DeleteSemantic.java b/aai-core/src/main/java/org/onap/aai/serialization/db/DeleteSemantic.java

index a6fe22b..abaa876 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/DeleteSemantic.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/DeleteSemantic.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperties.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperties.java

index 73ece7e..2c9d6e9 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperties.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperties.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperty.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperty.java

index 65753a2..de00594 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperty.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeProperty.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.serialization.db;
  
  public enum EdgeProperty {
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.java

index 92643bc..a683884 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRule.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRule.java

index 0a32db7..2a0a046 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRule.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRule.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRules.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRules.java

index 622c306..8d94b84 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRules.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeRules.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeType.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeType.java

index 088e13b..9070578 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeType.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgeType.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/GetAllPool.java b/aai-core/src/main/java/org/onap/aai/serialization/db/GetAllPool.java

index 4d38bd3..599906b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/GetAllPool.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/GetAllPool.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/GraphSingleton.java b/aai-core/src/main/java/org/onap/aai/serialization/db/GraphSingleton.java

index 9bb04d6..c90e1ee 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/GraphSingleton.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/GraphSingleton.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/InMemoryGraphSingleton.java b/aai-core/src/main/java/org/onap/aai/serialization/db/InMemoryGraphSingleton.java

index 091ab45..369161a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/InMemoryGraphSingleton.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/InMemoryGraphSingleton.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/LegacyDBSerializer.java b/aai-core/src/main/java/org/onap/aai/serialization/db/LegacyDBSerializer.java

index b934381..b433fde 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/LegacyDBSerializer.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/LegacyDBSerializer.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/MultiplicityRule.java b/aai-core/src/main/java/org/onap/aai/serialization/db/MultiplicityRule.java

index 0451c0d..ce8d90b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/MultiplicityRule.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/MultiplicityRule.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/TitanGraphSingleton.java b/aai-core/src/main/java/org/onap/aai/serialization/db/TitanGraphSingleton.java

index e1accb4..4c1f318 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/TitanGraphSingleton.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/TitanGraphSingleton.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java

index 6baa113..74961cb 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/MultipleEdgeRuleFoundException.java b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/MultipleEdgeRuleFoundException.java

index f94eb40..98ba75b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/MultipleEdgeRuleFoundException.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/MultipleEdgeRuleFoundException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.serialization.db.exceptions;
  
  import org.onap.aai.exceptions.AAIException;
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java

index b66f014..758d76c 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/util/VersionChecker.java b/aai-core/src/main/java/org/onap/aai/serialization/db/util/VersionChecker.java

index 04c57ed..a15fd22 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/db/util/VersionChecker.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/db/util/VersionChecker.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================\r
   * org.onap.aai\r
   * ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
   * ================================================================================\r
   * Licensed under the Apache License, Version 2.0 (the "License");\r
   * you may not use this file except in compliance with the License.\r
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and\r
   * limitations under the License.\r
   * ============LICENSE_END=========================================================\r
- *\r
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
   */\r
  package org.onap.aai.serialization.db.util;\r
  \r
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/engines/InMemoryDBEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/InMemoryDBEngine.java

index 197aff9..a7aef9d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/engines/InMemoryDBEngine.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/InMemoryDBEngine.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.engines;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/engines/QueryStyle.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/QueryStyle.java

index db947bf..74c74d2 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/engines/QueryStyle.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/QueryStyle.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.engines;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/engines/TitanDBEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/TitanDBEngine.java

index 315081e..4c6cb67 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/engines/TitanDBEngine.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/TitanDBEngine.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.engines;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/engines/TransactionalGraphEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/TransactionalGraphEngine.java

index 11bf595..f300bd2 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/engines/TransactionalGraphEngine.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/TransactionalGraphEngine.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.engines;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java

index 2773303..d2c68fc 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.engines.query;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinPipelineQueryEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinPipelineQueryEngine.java

index e8acaec..74a23ef 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinPipelineQueryEngine.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinPipelineQueryEngine.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.engines.query;/*-
   * ============LICENSE_START=======================================================
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinQueryEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinQueryEngine.java

index ab62296..18394dd 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinQueryEngine.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GremlinQueryEngine.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.engines.query;/*-
   * ============LICENSE_START=======================================================
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.java

index 0e00094..c292946 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.engines.query;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Console.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Console.java

index f101f89..18fed75 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Console.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Console.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java

index aea4ba1..87ffd3a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Format.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Format.java

index 04f4d1c..be57fb9 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Format.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Format.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java

index aec0be2..416ff9f 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatMapper.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatMapper.java

index 4401835..a98b423 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatMapper.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatMapper.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java

index 698aef6..123a1b2 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java

index 00aa781..3b803b4 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/GraphSON.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java

index 4395c8c..8fd196d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/MultiFormatMapper.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/MultiFormatMapper.java

index e4b5fc1..8ee52a1 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/MultiFormatMapper.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/MultiFormatMapper.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================\r
   * org.onap.aai\r
   * ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
   * ================================================================================\r
   * Licensed under the Apache License, Version 2.0 (the "License");\r
   * you may not use this file except in compliance with the License.\r
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and\r
   * limitations under the License.\r
   * ============LICENSE_END=========================================================\r
- *\r
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
   */\r
  package org.onap.aai.serialization.queryformats;\r
  \r
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java

index 759f9c5..f8bdcd7 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/RawFormat.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/RawFormat.java

index 425c6ed..fc68def 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/RawFormat.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/RawFormat.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java

index 429530c..2940adb 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SimpleFormat.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SimpleFormat.java

index ba49e3a..2efb657 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SimpleFormat.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SimpleFormat.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SubGraphStyle.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SubGraphStyle.java

index 6a8acd2..95cbbf4 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SubGraphStyle.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/SubGraphStyle.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatQueryResultFormatNotSupported.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatQueryResultFormatNotSupported.java

index 8d8e683..9d79330 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatQueryResultFormatNotSupported.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatQueryResultFormatNotSupported.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java

index 98b9005..108a9c8 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java

index 313b894..31b0a57 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.exceptions;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Depth.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Depth.java

index e98f066..de485fe 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Depth.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Depth.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.params;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Inject.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Inject.java

index 18d8554..6a1ff42 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Inject.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Inject.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.params;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/NodesOnly.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/NodesOnly.java

index 1429d55..f0fa5da 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/NodesOnly.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/NodesOnly.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.params;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Setter.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Setter.java

index e95de0d..f760391 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Setter.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/params/Setter.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.params;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.java

index 29fb56d..e397613 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.utils;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java

index 8387285..b252cbb 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/UrlBuilder.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.utils;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.java b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.java

index 82aa744..09abfb1 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.tinkerpop;
  
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.java b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.java

index e953dc2..62a4589 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.tinkerpop;
  
diff --git a/aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.java b/aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.java

index e1f554a..04fffc8 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.java
+++ b/aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.tasks;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/AAIApiServerURLBase.java b/aai-core/src/main/java/org/onap/aai/util/AAIApiServerURLBase.java

index 6886990..113c0b8 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/AAIApiServerURLBase.java
+++ b/aai-core/src/main/java/org/onap/aai/util/AAIApiServerURLBase.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java b/aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java

index 042fd17..c26261a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java
+++ b/aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/AAIConfig.java b/aai-core/src/main/java/org/onap/aai/util/AAIConfig.java

index 6f90497..d1b2163 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/AAIConfig.java
+++ b/aai-core/src/main/java/org/onap/aai/util/AAIConfig.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/AAIConfigCommandLinePropGetter.java b/aai-core/src/main/java/org/onap/aai/util/AAIConfigCommandLinePropGetter.java

index 9c30187..54ca943 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/AAIConfigCommandLinePropGetter.java
+++ b/aai-core/src/main/java/org/onap/aai/util/AAIConfigCommandLinePropGetter.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/AAIConstants.java b/aai-core/src/main/java/org/onap/aai/util/AAIConstants.java

index 9c875ec..181b499 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/AAIConstants.java
+++ b/aai-core/src/main/java/org/onap/aai/util/AAIConstants.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/AAIMechIdConfig.java b/aai-core/src/main/java/org/onap/aai/util/AAIMechIdConfig.java

index 04d0774..2aa3316 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/AAIMechIdConfig.java
+++ b/aai-core/src/main/java/org/onap/aai/util/AAIMechIdConfig.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/AAIRSyncUtility.java b/aai-core/src/main/java/org/onap/aai/util/AAIRSyncUtility.java

index 448d067..64d9224 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/AAIRSyncUtility.java
+++ b/aai-core/src/main/java/org/onap/aai/util/AAIRSyncUtility.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  /**
   * 
diff --git a/aai-core/src/main/java/org/onap/aai/util/AAISystemExitUtil.java b/aai-core/src/main/java/org/onap/aai/util/AAISystemExitUtil.java

index 9149d0b..c76b542 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/AAISystemExitUtil.java
+++ b/aai-core/src/main/java/org/onap/aai/util/AAISystemExitUtil.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/AutoGenerateHtml.java b/aai-core/src/main/java/org/onap/aai/util/AutoGenerateHtml.java

index f0489da..3f64c0f 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/AutoGenerateHtml.java
+++ b/aai-core/src/main/java/org/onap/aai/util/AutoGenerateHtml.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/Entity.java b/aai-core/src/main/java/org/onap/aai/util/Entity.java

index b672ffb..ebb066b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/Entity.java
+++ b/aai-core/src/main/java/org/onap/aai/util/Entity.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/EntityList.java b/aai-core/src/main/java/org/onap/aai/util/EntityList.java

index fb91795..0b60041 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/EntityList.java
+++ b/aai-core/src/main/java/org/onap/aai/util/EntityList.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/FileWatcher.java b/aai-core/src/main/java/org/onap/aai/util/FileWatcher.java

index 55d0123..16e239a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/FileWatcher.java
+++ b/aai-core/src/main/java/org/onap/aai/util/FileWatcher.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/FormatDate.java b/aai-core/src/main/java/org/onap/aai/util/FormatDate.java

index bf44dd1..77e39f7 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/FormatDate.java
+++ b/aai-core/src/main/java/org/onap/aai/util/FormatDate.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java b/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java

index b39bc3b..4ee65dd 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java
+++ b/aai-core/src/main/java/org/onap/aai/util/GenerateXsd.java
@@ -2,24 +2,21 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.util;
  
  import com.google.common.base.Joiner;
diff --git a/aai-core/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.java b/aai-core/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.java

index 792f7d5..b687ee4 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.java
+++ b/aai-core/src/main/java/org/onap/aai/util/HbaseSaltPrefixer.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java b/aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java

index 9d15f09..3cfcbcd 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java
+++ b/aai-core/src/main/java/org/onap/aai/util/HttpsAuthClient.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/HttpsAuthExternalClient.java b/aai-core/src/main/java/org/onap/aai/util/HttpsAuthExternalClient.java

index a984c1e..84aa690 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/HttpsAuthExternalClient.java
+++ b/aai-core/src/main/java/org/onap/aai/util/HttpsAuthExternalClient.java
@@ -1,15 +1,15 @@
-/*-
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
   * limitations under the License.
   * ============LICENSE_END=========================================================
   */
-
  package org.onap.aai.util;
  
  import java.io.FileInputStream;
diff --git a/aai-core/src/main/java/org/onap/aai/util/KeyValueList.java b/aai-core/src/main/java/org/onap/aai/util/KeyValueList.java

index 12672b3..cf0929d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/KeyValueList.java
+++ b/aai-core/src/main/java/org/onap/aai/util/KeyValueList.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/MapperUtil.java b/aai-core/src/main/java/org/onap/aai/util/MapperUtil.java

index 9633fda..8280ce0 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/MapperUtil.java
+++ b/aai-core/src/main/java/org/onap/aai/util/MapperUtil.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/PojoUtils.java b/aai-core/src/main/java/org/onap/aai/util/PojoUtils.java

index 5a84d9d..8f0469d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/PojoUtils.java
+++ b/aai-core/src/main/java/org/onap/aai/util/PojoUtils.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/Request.java b/aai-core/src/main/java/org/onap/aai/util/Request.java

index 46c891c..868f058 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/Request.java
+++ b/aai-core/src/main/java/org/onap/aai/util/Request.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/RestController.java b/aai-core/src/main/java/org/onap/aai/util/RestController.java

index 421946e..b7be8db 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/RestController.java
+++ b/aai-core/src/main/java/org/onap/aai/util/RestController.java
@@ -1,15 +1,15 @@
-/*-
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
   * limitations under the License.
   * ============LICENSE_END=========================================================
   */
-
  package org.onap.aai.util;
  
  import java.security.KeyManagementException;
diff --git a/aai-core/src/main/java/org/onap/aai/util/RestObject.java b/aai-core/src/main/java/org/onap/aai/util/RestObject.java

index 0b267d4..f367c2e 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/RestObject.java
+++ b/aai-core/src/main/java/org/onap/aai/util/RestObject.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/RestURLEncoder.java b/aai-core/src/main/java/org/onap/aai/util/RestURLEncoder.java

index 0b97c66..94cce9b 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/RestURLEncoder.java
+++ b/aai-core/src/main/java/org/onap/aai/util/RestURLEncoder.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/StoreNotificationEvent.java b/aai-core/src/main/java/org/onap/aai/util/StoreNotificationEvent.java

index 2a64e99..375a2ad 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/StoreNotificationEvent.java
+++ b/aai-core/src/main/java/org/onap/aai/util/StoreNotificationEvent.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/UniquePropertyCheck.java b/aai-core/src/main/java/org/onap/aai/util/UniquePropertyCheck.java

index 72e5380..512ac75 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/UniquePropertyCheck.java
+++ b/aai-core/src/main/java/org/onap/aai/util/UniquePropertyCheck.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  import java.util.HashMap;
diff --git a/aai-core/src/main/java/org/onap/aai/util/swagger/Api.java b/aai-core/src/main/java/org/onap/aai/util/swagger/Api.java

index e1e16c2..8ec5804 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/swagger/Api.java
+++ b/aai-core/src/main/java/org/onap/aai/util/swagger/Api.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util.swagger;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/swagger/Definition.java b/aai-core/src/main/java/org/onap/aai/util/swagger/Definition.java

index 9c8f078..5e8a5ec 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/swagger/Definition.java
+++ b/aai-core/src/main/java/org/onap/aai/util/swagger/Definition.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util.swagger;
  
diff --git a/aai-core/src/main/java/org/onap/aai/util/swagger/GenerateSwagger.java b/aai-core/src/main/java/org/onap/aai/util/swagger/GenerateSwagger.java

index 9d36c0e..ab34a3e 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/swagger/GenerateSwagger.java
+++ b/aai-core/src/main/java/org/onap/aai/util/swagger/GenerateSwagger.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util.swagger;
  
diff --git a/aai-core/src/main/java/org/onap/aai/workarounds/LegacyURITransformer.java b/aai-core/src/main/java/org/onap/aai/workarounds/LegacyURITransformer.java

index aabad32..b36d3e9 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/workarounds/LegacyURITransformer.java
+++ b/aai-core/src/main/java/org/onap/aai/workarounds/LegacyURITransformer.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.workarounds;
  
diff --git a/aai-core/src/main/java/org/onap/aai/workarounds/NamingExceptions.java b/aai-core/src/main/java/org/onap/aai/workarounds/NamingExceptions.java

index e2be0d7..435fa4d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/workarounds/NamingExceptions.java
+++ b/aai-core/src/main/java/org/onap/aai/workarounds/NamingExceptions.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.workarounds;
  
diff --git a/aai-core/src/main/java/org/onap/aai/workarounds/RemoveDME2QueryParams.java b/aai-core/src/main/java/org/onap/aai/workarounds/RemoveDME2QueryParams.java

index 1116ed5..7d435b2 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/workarounds/RemoveDME2QueryParams.java
+++ b/aai-core/src/main/java/org/onap/aai/workarounds/RemoveDME2QueryParams.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.workarounds;
  
diff --git a/aai-core/src/test/java/org/onap/aai/AAIJunitRunner.java b/aai-core/src/test/java/org/onap/aai/AAIJunitRunner.java

index 52c83bf..41a2f42 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/AAIJunitRunner.java
+++ b/aai-core/src/test/java/org/onap/aai/AAIJunitRunner.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai;
  
diff --git a/aai-core/src/test/java/org/onap/aai/AAISetup.java b/aai-core/src/test/java/org/onap/aai/AAISetup.java

index f531cea..674f170 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/AAISetup.java
+++ b/aai-core/src/test/java/org/onap/aai/AAISetup.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai;
  
diff --git a/aai-core/src/test/java/org/onap/aai/HttpTestUtil.java b/aai-core/src/test/java/org/onap/aai/HttpTestUtil.java

index 1ec1a05..7284593 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/HttpTestUtil.java
+++ b/aai-core/src/test/java/org/onap/aai/HttpTestUtil.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai;
  
diff --git a/aai-core/src/test/java/org/onap/aai/PayloadUtil.java b/aai-core/src/test/java/org/onap/aai/PayloadUtil.java

index 43fd290..88261aa 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/PayloadUtil.java
+++ b/aai-core/src/test/java/org/onap/aai/PayloadUtil.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai;
  
diff --git a/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java b/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java

index e358dc8..4c472cc 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java
+++ b/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.dbmap;
  
  import com.thinkaurelius.titan.core.TitanFactory;
diff --git a/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java b/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java

index 36757e2..02fb8fa 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java
+++ b/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.exceptions;
  
diff --git a/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionWithInfoTest.java b/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionWithInfoTest.java

index 961bf68..3489c25 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionWithInfoTest.java
+++ b/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionWithInfoTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.exceptions;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/IntrospectorTestSpec.java b/aai-core/src/test/java/org/onap/aai/introspection/IntrospectorTestSpec.java

index d3a982d..f2925c3 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/IntrospectorTestSpec.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/IntrospectorTestSpec.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/JSONStrategyTest.java b/aai-core/src/test/java/org/onap/aai/introspection/JSONStrategyTest.java

index 6485689..8a193c1 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/JSONStrategyTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/JSONStrategyTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/MoxyEngineTest.java b/aai-core/src/test/java/org/onap/aai/introspection/MoxyEngineTest.java

index e3c15fc..5029d73 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/MoxyEngineTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/MoxyEngineTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/PojoInjestorTest.java b/aai-core/src/test/java/org/onap/aai/introspection/PojoInjestorTest.java

index 4f78f7b..6794838 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/PojoInjestorTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/PojoInjestorTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/PojoLoaderTest.java b/aai-core/src/test/java/org/onap/aai/introspection/PojoLoaderTest.java

index bcd809d..29ab5a1 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/PojoLoaderTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/PojoLoaderTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/PojoStrategyTest.java b/aai-core/src/test/java/org/onap/aai/introspection/PojoStrategyTest.java

index 6683270..d30b51b 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/PojoStrategyTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/PojoStrategyTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/PropertyPredicatesTest.java b/aai-core/src/test/java/org/onap/aai/introspection/PropertyPredicatesTest.java

index d5eaf0b..13a4ea3 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/PropertyPredicatesTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/PropertyPredicatesTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/ReflectionEngineTest.java b/aai-core/src/test/java/org/onap/aai/introspection/ReflectionEngineTest.java

index 6869fd7..54489bf 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/ReflectionEngineTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/ReflectionEngineTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataCopyTest.java b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataCopyTest.java

index 65a241f..250c34c 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataCopyTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataCopyTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.sideeffect;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java

index 684bb5b..3b58f44 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.sideeffect;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/tools/CreateUUIDTest.java b/aai-core/src/test/java/org/onap/aai/introspection/tools/CreateUUIDTest.java

index bb2604e..3eeb299 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/tools/CreateUUIDTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/tools/CreateUUIDTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.tools;
  
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/validation/IntrospectorValidationTest.java b/aai-core/src/test/java/org/onap/aai/introspection/validation/IntrospectorValidationTest.java

index 3bba4ee..4954378 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/validation/IntrospectorValidationTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/validation/IntrospectorValidationTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.introspection.validation;
  
diff --git a/aai-core/src/test/java/org/onap/aai/logging/CNNameTest.java b/aai-core/src/test/java/org/onap/aai/logging/CNNameTest.java

index d5cd62c..7a95d31 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/logging/CNNameTest.java
+++ b/aai-core/src/test/java/org/onap/aai/logging/CNNameTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/test/java/org/onap/aai/logging/CustomLogPatternLayoutTest.java b/aai-core/src/test/java/org/onap/aai/logging/CustomLogPatternLayoutTest.java

index 04aaaf0..b4d14d3 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/logging/CustomLogPatternLayoutTest.java
+++ b/aai-core/src/test/java/org/onap/aai/logging/CustomLogPatternLayoutTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/test/java/org/onap/aai/logging/DME2RestFlagTest.java b/aai-core/src/test/java/org/onap/aai/logging/DME2RestFlagTest.java

index 59177ef..09e6ed1 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/logging/DME2RestFlagTest.java
+++ b/aai-core/src/test/java/org/onap/aai/logging/DME2RestFlagTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  import static org.junit.Assert.*;
diff --git a/aai-core/src/test/java/org/onap/aai/logging/EcompErrorCategoryTest.java b/aai-core/src/test/java/org/onap/aai/logging/EcompErrorCategoryTest.java

index 485a63f..eaa8a53 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/logging/EcompErrorCategoryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/logging/EcompErrorCategoryTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/test/java/org/onap/aai/logging/EcompResponseCodeTest.java b/aai-core/src/test/java/org/onap/aai/logging/EcompResponseCodeTest.java

index 522aeb2..0bdfc74 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/logging/EcompResponseCodeTest.java
+++ b/aai-core/src/test/java/org/onap/aai/logging/EcompResponseCodeTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/test/java/org/onap/aai/logging/EcompResponseDescriptionTest.java b/aai-core/src/test/java/org/onap/aai/logging/EcompResponseDescriptionTest.java

index 3453d2d..fbdc998 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/logging/EcompResponseDescriptionTest.java
+++ b/aai-core/src/test/java/org/onap/aai/logging/EcompResponseDescriptionTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/test/java/org/onap/aai/logging/EelfClassOfCallerTest.java b/aai-core/src/test/java/org/onap/aai/logging/EelfClassOfCallerTest.java

index adb2985..be04f27 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/logging/EelfClassOfCallerTest.java
+++ b/aai-core/src/test/java/org/onap/aai/logging/EelfClassOfCallerTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/test/java/org/onap/aai/logging/ErrorObjectTest.java b/aai-core/src/test/java/org/onap/aai/logging/ErrorObjectTest.java

index 1a4c185..ea36160 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/logging/ErrorObjectTest.java
+++ b/aai-core/src/test/java/org/onap/aai/logging/ErrorObjectTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/test/java/org/onap/aai/logging/LoggingContextTest.java b/aai-core/src/test/java/org/onap/aai/logging/LoggingContextTest.java

index 46ac599..1aafa4a 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/logging/LoggingContextTest.java
+++ b/aai-core/src/test/java/org/onap/aai/logging/LoggingContextTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.logging;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java

index 968adb3..b1ddcf6 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java

index c49aa39..1a4a2fb 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipGremlinQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipGremlinQueryTest.java

index 7310889..9c853e2 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipGremlinQueryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipGremlinQueryTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipQueryTest.java

index 7a72bcd..597c667 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipQueryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipQueryTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java

index 1229086..8a0c727 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueURIQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueURIQueryTest.java

index d9dcabd..735785b 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueURIQueryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueURIQueryTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.query;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/relationship/RelationshipToURITest.java b/aai-core/src/test/java/org/onap/aai/parsers/relationship/RelationshipToURITest.java

index 1710986..1d4aba5 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/relationship/RelationshipToURITest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/relationship/RelationshipToURITest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.relationship;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIParserTest.java b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIParserTest.java

index 42d26f9..bf59f4c 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIParserTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIParserTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToDBKeyTest.java b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToDBKeyTest.java

index 7656661..8079d7f 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToDBKeyTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToDBKeyTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToExtensionInformationTest.java b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToExtensionInformationTest.java

index ca64ec7..186773e 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToExtensionInformationTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToExtensionInformationTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToObjectTest.java b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToObjectTest.java

index d51dcea..0caaabe 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToObjectTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToObjectTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToRelationshipObjectTest.java b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToRelationshipObjectTest.java

index 4f15d27..28bad7d 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToRelationshipObjectTest.java
+++ b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToRelationshipObjectTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.parsers.uri;
  
diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/GremlinTraversalTest.java b/aai-core/src/test/java/org/onap/aai/query/builder/GremlinTraversalTest.java

index 02486b6..98ac0de 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/query/builder/GremlinTraversalTest.java
+++ b/aai-core/src/test/java/org/onap/aai/query/builder/GremlinTraversalTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/QueryBuilderTestAbstraction.java b/aai-core/src/test/java/org/onap/aai/query/builder/QueryBuilderTestAbstraction.java

index b475a38..bd8f078 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/query/builder/QueryBuilderTestAbstraction.java
+++ b/aai-core/src/test/java/org/onap/aai/query/builder/QueryBuilderTestAbstraction.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/SimplePathTest.java b/aai-core/src/test/java/org/onap/aai/query/builder/SimplePathTest.java

index 4dfe2db..417ad5a 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/query/builder/SimplePathTest.java
+++ b/aai-core/src/test/java/org/onap/aai/query/builder/SimplePathTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/TraversalQueryTest.java b/aai-core/src/test/java/org/onap/aai/query/builder/TraversalQueryTest.java

index 81d42dd..d5a0e4a 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/query/builder/TraversalQueryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/query/builder/TraversalQueryTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java b/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java

index d87eb67..c884f4f 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java
+++ b/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.query.builder;
  
diff --git a/aai-core/src/test/java/org/onap/aai/rest/CloudRegionTest.java b/aai-core/src/test/java/org/onap/aai/rest/CloudRegionTest.java

index 55fdd53..5abe4da 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/rest/CloudRegionTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/CloudRegionTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest;
  
diff --git a/aai-core/src/test/java/org/onap/aai/rest/GenericVnfLInterfaceTest.java b/aai-core/src/test/java/org/onap/aai/rest/GenericVnfLInterfaceTest.java

index f42eebb..9f8045b 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/rest/GenericVnfLInterfaceTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/GenericVnfLInterfaceTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest;
  
diff --git a/aai-core/src/test/java/org/onap/aai/rest/HPACapabilityTest.java b/aai-core/src/test/java/org/onap/aai/rest/HPACapabilityTest.java

index 2a9b510..ed7d8e3 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/rest/HPACapabilityTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/HPACapabilityTest.java
@@ -2,14 +2,14 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2018 Intel Corporation Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/aai-core/src/test/java/org/onap/aai/rest/PserverTest.java b/aai-core/src/test/java/org/onap/aai/rest/PserverTest.java

index 843d993..d97c706 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/rest/PserverTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/PserverTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest;
  
diff --git a/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java b/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java

index 3de8dfa..d454c78 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest;
  
diff --git a/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTest.java b/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTest.java

index 0d4f4f1..cf6f177 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.rest.db;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/DbAliasTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/DbAliasTest.java

index 2137b3e..e00c7eb 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/db/DbAliasTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/db/DbAliasTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java

index b124e5d..cff374c 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/EdgePropertyMapTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/EdgePropertyMapTest.java

index 8dbb800..2f3854e 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/db/EdgePropertyMapTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/db/EdgePropertyMapTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/EdgeRulesTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/EdgeRulesTest.java

index 773b9cd..81d4c88 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/db/EdgeRulesTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/db/EdgeRulesTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.db;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/util/VersionCheckerTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/util/VersionCheckerTest.java

index 093be69..031cf5c 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/db/util/VersionCheckerTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/db/util/VersionCheckerTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================\r
   * org.onap.aai\r
   * ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.\r
   * ================================================================================\r
   * Licensed under the Apache License, Version 2.0 (the "License");\r
   * you may not use this file except in compliance with the License.\r
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and\r
   * limitations under the License.\r
   * ============LICENSE_END=========================================================\r
- *\r
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
   */\r
  package org.onap.aai.serialization.db.util;\r
  \r
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngineTest.java b/aai-core/src/test/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngineTest.java

index 55002a6..07a7717 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngineTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngineTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.engines.query;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ConsoleTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ConsoleTest.java

index a60eaf9..5c906fe 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ConsoleTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ConsoleTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java

index 488064e..606b6f6 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/GraphSONTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/GraphSONTest.java

index 8f418a4..bb2a978 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/GraphSONTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/GraphSONTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java

index fde1307..c6aedf9 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java

index 53d1d29..609de5f 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java

index ae76467..5633e4c 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java

index fd3a889..23c8abf 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java

index 3c1b033..53b5f71 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.utils;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java

index 80ae706..5a64828 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.queryformats.utils;
  
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertexTest.java b/aai-core/src/test/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertexTest.java

index 9c1e922..5d73d11 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertexTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertexTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.serialization.tinkerpop;
  
diff --git a/aai-core/src/test/java/org/onap/aai/util/AAIConfigCommandLinePropGetterTest.java b/aai-core/src/test/java/org/onap/aai/util/AAIConfigCommandLinePropGetterTest.java

index fcce479..316cc15 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/AAIConfigCommandLinePropGetterTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/AAIConfigCommandLinePropGetterTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/test/java/org/onap/aai/util/AAIRSyncUtilityTest.java b/aai-core/src/test/java/org/onap/aai/util/AAIRSyncUtilityTest.java

index f5daf3b..287a585 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/AAIRSyncUtilityTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/AAIRSyncUtilityTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/test/java/org/onap/aai/util/FileWatcherTest.java b/aai-core/src/test/java/org/onap/aai/util/FileWatcherTest.java

index bb754c0..bc81591 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/FileWatcherTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/FileWatcherTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/test/java/org/onap/aai/util/FormatDateTest.java b/aai-core/src/test/java/org/onap/aai/util/FormatDateTest.java

index 6635f25..6295990 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/FormatDateTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/FormatDateTest.java
@@ -1,15 +1,15 @@
-/*-
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
   * limitations under the License.
   * ============LICENSE_END=========================================================
   */
-
  package org.onap.aai.util;
  
  
diff --git a/aai-core/src/test/java/org/onap/aai/util/GenerateXsdTest.java b/aai-core/src/test/java/org/onap/aai/util/GenerateXsdTest.java

index 9e1e33a..6fa5555 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/GenerateXsdTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/GenerateXsdTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/test/java/org/onap/aai/util/HbaseSaltPrefixerTest.java b/aai-core/src/test/java/org/onap/aai/util/HbaseSaltPrefixerTest.java

index 918f897..0b7073c 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/HbaseSaltPrefixerTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/HbaseSaltPrefixerTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/test/java/org/onap/aai/util/KeyValueListTest.java b/aai-core/src/test/java/org/onap/aai/util/KeyValueListTest.java

index c05ffef..8866506 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/KeyValueListTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/KeyValueListTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/test/java/org/onap/aai/util/MapperUtilTest.java b/aai-core/src/test/java/org/onap/aai/util/MapperUtilTest.java

index dae2c22..309d133 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/MapperUtilTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/MapperUtilTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util; 
   
diff --git a/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java b/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java

index 7121a82..7cb959f 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/test/java/org/onap/aai/util/RestURLEncoderTest.java b/aai-core/src/test/java/org/onap/aai/util/RestURLEncoderTest.java

index e296b5e..757a7bb 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/RestURLEncoderTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/RestURLEncoderTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/test/java/org/onap/aai/util/StoreNotificationEventTest.java b/aai-core/src/test/java/org/onap/aai/util/StoreNotificationEventTest.java

index 0050c10..5bd7984 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/util/StoreNotificationEventTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/StoreNotificationEventTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.util;
  
diff --git a/aai-core/src/test/java/org/onap/aai/workarounds/LegacyURITransformerTest.java b/aai-core/src/test/java/org/onap/aai/workarounds/LegacyURITransformerTest.java

index ebcaf75..f45a187 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/workarounds/LegacyURITransformerTest.java
+++ b/aai-core/src/test/java/org/onap/aai/workarounds/LegacyURITransformerTest.java
@@ -1,15 +1,15 @@
-/*-
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
   * limitations under the License.
   * ============LICENSE_END=========================================================
   */
-
  package org.onap.aai.workarounds;
  
  import org.junit.Test;
diff --git a/aai-core/src/test/java/org/onap/aai/workarounds/RemoveDME2QueryParamsTest.java b/aai-core/src/test/java/org/onap/aai/workarounds/RemoveDME2QueryParamsTest.java

index a5c7055..de31724 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/workarounds/RemoveDME2QueryParamsTest.java
+++ b/aai-core/src/test/java/org/onap/aai/workarounds/RemoveDME2QueryParamsTest.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.workarounds;
  
diff --git a/aai-schema-ingest/LICENSE.TXT b/aai-schema-ingest/LICENSE.TXT

new file mode 100644 (file)

index 0000000..3455862
--- /dev/null
+++ b/aai-schema-ingest/LICENSE.TXT
@@ -0,0 +1,17 @@
+============LICENSE_START=======================================================
+org.onap.aai
+================================================================================
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml

index d56b3bb..53c2bbf 100644 (file)
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -1,3 +1,24 @@
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java

index aa90a30..642ede8 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.edges;
  
  import java.io.BufferedReader;
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRule.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRule.java

index f859aae..bac217d 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRule.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.edges;
  
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java

index 3029685..701977a 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeRuleQuery.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.edges;
  
  import org.onap.aai.edges.enums.AAIDirection;
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/AAIDirection.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/AAIDirection.java

index 3f748a5..8ea5157 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/AAIDirection.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/AAIDirection.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.edges.enums;
  
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/DirectionNotation.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/DirectionNotation.java

index 203249a..7e4a65c 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/DirectionNotation.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/DirectionNotation.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.edges.enums;
  
  public enum DirectionNotation { 
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeField.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeField.java

index 3e896f6..e75a516 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeField.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeField.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.edges.enums;
  
  /**
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeProperty.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeProperty.java

index 2f6afa4..4ec3f07 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeProperty.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeProperty.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.edges.enums;
  
  /**
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeType.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeType.java

index 00dce0f..4a92142 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeType.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/EdgeType.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.edges.enums;
  
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/MultiplicityRule.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/MultiplicityRule.java

index 4fc8938..7f672c4 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/MultiplicityRule.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/enums/MultiplicityRule.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.edges.enums;
  
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/AmbiguousRuleChoiceException.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/AmbiguousRuleChoiceException.java

index ebb9739..9baf790 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/AmbiguousRuleChoiceException.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/AmbiguousRuleChoiceException.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.edges.exceptions;
  
  public class AmbiguousRuleChoiceException extends Exception {
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/EdgeRuleNotFoundException.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/EdgeRuleNotFoundException.java

index e1a8fe6..0bf414f 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/EdgeRuleNotFoundException.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/exceptions/EdgeRuleNotFoundException.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.edges.exceptions;
  
  public class EdgeRuleNotFoundException extends Exception {
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java b/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java

index 5a29806..849ad57 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.nodes;
  
  import java.io.File;
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java

index b34622d..e22dcdc 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.setup;
  
  import java.util.List;
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java

index 96c6344..049d0a8 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaLocationsBean.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.setup;
  
  import org.springframework.beans.factory.annotation.Value;
diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/Version.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/Version.java

index 8cc3942..81303f0 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/Version.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/Version.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.setup;
  
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java

index 9f6d67a..fe43de0 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.edges;
  
  import static org.junit.Assert.*;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorWiringTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorWiringTest.java

index 74aceb5..ac0c302 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorWiringTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorWiringTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.edges;
  
  import static org.junit.Assert.*;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeRuleQueryTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeRuleQueryTest.java

index f21246c..19aa0ce 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeRuleQueryTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeRuleQueryTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.edges;
  
  import static org.junit.Assert.*;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java

index 08507a3..f513557 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.nodes;
  
  import static org.junit.Assert.*;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java

index e62cc6a..92500d0 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorWiringTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.nodes;
  
  import static org.junit.Assert.*;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/ConfigTranslatorWiringTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/ConfigTranslatorWiringTest.java

index 9d66551..f0371b9 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/ConfigTranslatorWiringTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/ConfigTranslatorWiringTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.setup;
  
  import static org.junit.Assert.*;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanDefaultInjectionTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanDefaultInjectionTest.java

index 5074f91..3d7b589 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanDefaultInjectionTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanDefaultInjectionTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.setup;
  
  import static org.junit.Assert.*;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanEnvVarInjectionTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanEnvVarInjectionTest.java

index f9d6b62..3be939f 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanEnvVarInjectionTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanEnvVarInjectionTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.setup;
  
  import static org.junit.Assert.*;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterTest.java

index 0a22bbb..a96ca85 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.setup;
  
  import static org.junit.Assert.*;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java

index 4604b04..7c96b9a 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.setup;
  
  import static org.junit.Assert.*;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/ConfigTranslatorForWiringTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/ConfigTranslatorForWiringTest.java

index 5e1b6c8..b69e3ac 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/ConfigTranslatorForWiringTest.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/ConfigTranslatorForWiringTest.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.testutils;
  
  import java.util.ArrayList;
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java

index 785b740..f69ba29 100644 (file)
--- a/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java
+++ b/aai-schema-ingest/src/test/java/org/onap/aai/testutils/TestUtilConfigTranslator.java
@@ -1,14 +1,14 @@
-/** 
+/**
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,7 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
-
  package org.onap.aai.testutils;
  
  import java.util.ArrayList;
diff --git a/aai-schema/LICENSE.TXT b/aai-schema/LICENSE.TXT

index 72b8cfb..3455862 100644 (file)
--- a/aai-schema/LICENSE.TXT
+++ b/aai-schema/LICENSE.TXT
@@ -1,7 +1,7 @@
  ============LICENSE_START=======================================================
  org.onap.aai
  ================================================================================
-Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  ================================================================================
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -15,5 +15,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  ============LICENSE_END=========================================================
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml

index c44464f..d270296 100644 (file)
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -1,4 +1,25 @@
  <?xml version="1.0"?>
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
  <project
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/aai-schema/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java b/aai-schema/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java

index 4fc49ed..7e54b44 100644 (file)
--- a/aai-schema/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java
+++ b/aai-schema/src/main/java/org/onap/aai/schema/enums/ObjectMetadata.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.schema.enums;
  
diff --git a/aai-schema/src/main/java/org/onap/aai/schema/enums/PropertyMetadata.java b/aai-schema/src/main/java/org/onap/aai/schema/enums/PropertyMetadata.java

index 2809b3d..1e26359 100644 (file)
--- a/aai-schema/src/main/java/org/onap/aai/schema/enums/PropertyMetadata.java
+++ b/aai-schema/src/main/java/org/onap/aai/schema/enums/PropertyMetadata.java
@@ -2,7 +2,7 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aai.schema.enums;
  
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v10.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v10.html

index 0fe66c2..5247c28 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v10.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v10.html
@@ -158360,8 +158360,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
@@ -158448,11 +158448,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
  
                                  <section class="json-schema-properties">
                                      <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
+                                                 <span class="json-property-required"></span>
                                              </dt>
                                              <dd>
                                                  <p>name of the specific HPA attribute</p>
@@ -158460,8 +158461,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html

index 7f95ad5..e2e7b36 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html
@@ -171265,8 +171265,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
@@ -171353,11 +171353,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
  
                                  <section class="json-schema-properties">
                                      <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
+                                                 <span class="json-property-required"></span>
                                              </dt>
                                              <dd>
                                                  <p>name of the specific HPA attribute</p>
@@ -171365,8 +171366,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v12.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v12.html

index 056c324..77ee6f4 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v12.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v12.html
@@ -197,17 +197,32 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--get">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
                          <td><p>returns hpa-feature-attributes</p>
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>create or update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch">PATCH /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>delete an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</a></td>
                          <td><p>see node definition for valid relationships</p>
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</a></td>
                          <td><p>delete an existing relationship</p>
          </td>
                      </tr>
@@ -292,17 +307,32 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--get">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
                          <td><p>returns hpa-feature-attributes</p>
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>create or update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch">PATCH /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>delete an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</a></td>
                          <td><p>see node definition for valid relationships</p>
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</a></td>
                          <td><p>delete an existing relationship</p>
          </td>
                      </tr>
@@ -19136,7 +19166,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                hpa-hw-arch
+                                                architecture
                                              </td>
                                              <td>
                                                 <p>Hardware architecture</p>
@@ -19618,11 +19648,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get" class="swagger--panel-operation-get panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--get" class="swagger--panel-operation-get panel">
                  <div class="panel-heading">
                      <div class="operation-summary">returns hpa-feature-attributes</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
@@ -19707,6 +19737,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                          <tr>
                                              <td>
                                                  cloud-type
@@ -19769,7 +19815,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                hpa-hw-arch
+                                                architecture
                                              </td>
                                              <td>
                                                 <p>Hardware architecture</p>
@@ -19836,17 +19882,17 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">create or update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>see node definition for valid relationships</p>
+                        <p>create or update an existing hpa-feature-attributes</p>
              
                      </section>
                         <section class="sw-request-body">
@@ -19855,13 +19901,13 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                          </p>
                                                 <div class="row">
                                              <div class="col-md-6">
-                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
                          </p>
                                              </div>
                                              <div class="col-md-6 sw-request-model">
                              <div  class="panel panel-definition">
                                  <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
+                                            <a class="json-schema-ref" href="#/definitions/hpa-feature-attributes">/hpa-feature-attributes</a>
                                  </div>
                              </div></div>
                                          </div>
@@ -19942,6 +19988,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -19973,23 +20035,35 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch" class="swagger--panel-operation-patch panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing relationship</p>
+                        <p>update an existing hpa-feature-attributes</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated.</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -20067,6 +20141,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -20098,35 +20188,23 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">delete an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>see node definition for valid relationships</p>
+                        <p>delete an existing hpa-feature-attributes</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
-                                               <div class="row">
-                                            <div class="col-md-6">
-                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapability.json)</p>
-                        </p>
-                                            </div>
-                                            <div class="col-md-6 sw-request-model">
-                            <div  class="panel panel-definition">
-                                <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
-                                </div>
-                            </div></div>
-                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -20204,6 +20282,38 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                resource-version
+                                            </td>
+                                            <td>
+                                               <p>resource-version for concurrency</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -20235,23 +20345,35 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">see node definition for valid relationships</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing relationship</p>
+                        <p>see node definition for valid relationships</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
+                                </div>
+                            </div></div>
+                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -20329,6 +20451,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -20360,35 +20498,23 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">delete an existing relationship</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>see node definition for valid relationships</p>
+                        <p>delete an existing relationship</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
-                                               <div class="row">
-                                            <div class="col-md-6">
-                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor.json)</p>
-                        </p>
-                                            </div>
-                                            <div class="col-md-6 sw-request-model">
-                            <div  class="panel panel-definition">
-                                <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
-                                </div>
-                            </div></div>
-                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -20450,6 +20576,38 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                               <p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -20481,23 +20639,35 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">see node definition for valid relationships</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing relationship</p>
+                        <p>see node definition for valid relationships</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapability.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
+                                </div>
+                            </div></div>
+                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -20559,6 +20729,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                               <p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -20590,17 +20776,372 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-get" class="swagger--panel-operation-get panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">returns group-assignments</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments</strong></h3>
+                    <div class="operation-summary">delete an existing relationship</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>returns group-assignments</p>
+                        <p>delete an existing relationship</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                               <p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                               <p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">see node definition for valid relationships</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/relationship-list/relationship</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>see node definition for valid relationships</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                               <p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">delete an existing relationship</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/relationship-list/relationship</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>delete an existing relationship</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                               <p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-get" class="swagger--panel-operation-get panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">returns group-assignments</div>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>returns group-assignments</p>
              
                      </section>
                          <section class="sw-request-params">
@@ -21160,24 +21701,374 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--delete" class="swagger--panel-operation-delete panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">delete an existing group-assignment</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>delete an existing group-assignment</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                group-id
+                                            </td>
+                                            <td>
+                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                resource-version
+                                            </td>
+                                            <td>
+                                               <p>resource-version for concurrency</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">see node definition for valid relationships</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}/relationship-list/relationship</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>see node definition for valid relationships</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                group-id
+                                            </td>
+                                            <td>
+                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">delete an existing relationship</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}/relationship-list/relationship</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>delete an existing relationship</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                group-id
+                                            </td>
+                                            <td>
+                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-get" class="swagger--panel-operation-get panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing group-assignment</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}</strong></h3>
+                    <div class="operation-summary">returns hpa-capabilities</div>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing group-assignment</p>
+                        <p>returns hpa-capabilities</p>
              
                      </section>
-                       <section class="sw-request-body">
-                                
-                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
-                        </p>
-                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -21224,26 +22115,25 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                group-id
+                                                cloud-type
                                              </td>
                                              <td>
-                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                               <p>Type of the cloud (e.g., openstack)</p>
                                          </td>
-                                            <td>path</td>
+                                            <td>query</td>
                                              <td>
                                                 <span class="json-property-type">string</span>
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
-                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                          <tr>
                                              <td>
-                                                resource-version
+                                                owner-defined-type
                                              </td>
                                              <td>
-                                               <p>resource-version for concurrency</p>
+                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
                                          </td>
                                              <td>query</td>
                                              <td>
@@ -21251,7 +22141,6 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
-                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                  </tbody>
@@ -21263,6 +22152,29 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
+                                    <dt class="sw-response-200">
+                                        200 OK
+                                    
+                                    </dt>
+                                    <dd class="sw-response-200">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>successful operation</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+
+                                                <div class="col-md-6 sw-response-model">
+                                                <div  class="panel panel-definition">
+
+                                                    <div class="panel-body">
+                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-capabilities">/hpa-capabilities</a>
+                                                    </div>
+                                                </div>
+                                                </div>
+
+                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -21285,36 +22197,19 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--get" class="swagger--panel-operation-get panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">returns hpa-capability</div>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>see node definition for valid relationships</p>
+                        <p>returns hpa-capability</p>
              
                      </section>
-                       <section class="sw-request-body">
-                                
-                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
-                        </p>
-                                               <div class="row">
-                                            <div class="col-md-6">
-                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment.json)</p>
-                        </p>
-                                            </div>
-                                            <div class="col-md-6 sw-request-model">
-                            <div  class="panel panel-definition">
-                                <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
-                                </div>
-                            </div></div>
-                                        </div>
-                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -21361,10 +22256,10 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                group-id
+                                                hpa-capability-id
                                              </td>
                                              <td>
-                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                               <p>UUID to uniquely identify a HPA capability</p>
                                          </td>
                                              <td>path</td>
                                              <td>
@@ -21375,6 +22270,66 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-type
+                                            </td>
+                                            <td>
+                                               <p>Type of the cloud (e.g., openstack)</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                owner-defined-type
+                                            </td>
+                                            <td>
+                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-feature
+                                            </td>
+                                            <td>
+                                               <p>Name of the HPACapability</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                architecture
+                                            </td>
+                                            <td>
+                                               <p>Hardware architecture</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -21384,6 +22339,29 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
+                                    <dt class="sw-response-200">
+                                        200 OK
+                                    
+                                    </dt>
+                                    <dd class="sw-response-200">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>successful operation</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+
+                                                <div class="col-md-6 sw-response-model">
+                                                <div  class="panel panel-definition">
+
+                                                    <div class="panel-body">
+                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-capability">/hpa-capability</a>
+                                                    </div>
+                                                </div>
+                                                </div>
+
+                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -21406,23 +22384,35 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">create or update an existing hpa-capability</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing relationship</p>
+                        <p>create or update an existing hpa-capability</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-capability object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/hpa-capability">/hpa-capability</a>
+                                </div>
+                            </div></div>
+                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -21470,10 +22460,10 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                group-id
+                                                hpa-capability-id
                                              </td>
                                              <td>
-                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                               <p>UUID to uniquely identify a HPA capability</p>
                                          </td>
                                              <td>path</td>
                                              <td>
@@ -21515,19 +22505,36 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-get" class="swagger--panel-operation-get panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--patch" class="swagger--panel-operation-patch panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">returns hpa-capabilities</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities</strong></h3>
+                    <div class="operation-summary">update an existing hpa-capability</div>
+                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>returns hpa-capabilities</p>
+                        <p>update an existing hpa-capability</p>
              
                      </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-capability object that needs to be created or updated.</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-capability">/hpa-capability</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -21574,32 +22581,18 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                cloud-type
-                                            </td>
-                                            <td>
-                                               <p>Type of the cloud (e.g., openstack)</p>
-                                        </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                owner-defined-type
+                                                hpa-capability-id
                                              </td>
                                              <td>
-                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
+                                               <p>UUID to uniquely identify a HPA capability</p>
                                          </td>
-                                            <td>query</td>
+                                            <td>path</td>
                                              <td>
                                                 <span class="json-property-type">string</span>
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
+                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                  </tbody>
@@ -21611,29 +22604,6 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
-                                    <dt class="sw-response-200">
-                                        200 OK
-                                    
-                                    </dt>
-                                    <dd class="sw-response-200">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <p>successful operation</p>
-                                            
-                                                </div>
-                                            </div>
-                                            <div class="row">
-
-                                                <div class="col-md-6 sw-response-model">
-                                                <div  class="panel panel-definition">
-
-                                                    <div class="panel-body">
-                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-capabilities">/hpa-capabilities</a>
-                                                    </div>
-                                                </div>
-                                                </div>
-
-                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -21657,18 +22627,23 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
              </div>    
          
          <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--get" class="swagger--panel-operation-get panel">
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">returns hpa-capability</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
+                    <div class="operation-summary">delete an existing hpa-capability</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>returns hpa-capability</p>
+                        <p>delete an existing hpa-capability</p>
              
                      </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -21731,55 +22706,10 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                cloud-type
-                                            </td>
-                                            <td>
-                                               <p>Type of the cloud (e.g., openstack)</p>
-                                        </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                owner-defined-type
-                                            </td>
-                                            <td>
-                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
-                                        </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                hpa-feature
-                                            </td>
-                                            <td>
-                                               <p>Name of the HPACapability</p>
-                                        </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                hpa-hw-arch
+                                                resource-version
                                              </td>
                                              <td>
-                                               <p>Hardware architecture</p>
+                                               <p>resource-version for concurrency</p>
                                          </td>
                                              <td>query</td>
                                              <td>
@@ -21787,6 +22717,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
+                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                  </tbody>
@@ -21798,29 +22729,6 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
-                                    <dt class="sw-response-200">
-                                        200 OK
-                                    
-                                    </dt>
-                                    <dd class="sw-response-200">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <p>successful operation</p>
-                                            
-                                                </div>
-                                            </div>
-                                            <div class="row">
-
-                                                <div class="col-md-6 sw-response-model">
-                                                <div  class="panel panel-definition">
-
-                                                    <div class="panel-body">
-                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-capability">/hpa-capability</a>
-                                                    </div>
-                                                </div>
-                                                </div>
-
-                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -21843,36 +22751,19 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--get" class="swagger--panel-operation-get panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">create or update an existing hpa-capability</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
+                    <div class="operation-summary">returns hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>create or update an existing hpa-capability</p>
+                        <p>returns hpa-feature-attributes</p>
              
                      </section>
-                       <section class="sw-request-body">
-                                
-                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
-                        </p>
-                                               <div class="row">
-                                            <div class="col-md-6">
-                                                <p><p>hpa-capability object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability.json)</p>
-                        </p>
-                                            </div>
-                                            <div class="col-md-6 sw-request-model">
-                            <div  class="panel panel-definition">
-                                <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/definitions/hpa-capability">/hpa-capability</a>
-                                </div>
-                            </div></div>
-                                        </div>
-                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -21933,6 +22824,82 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-type
+                                            </td>
+                                            <td>
+                                               <p>Type of the cloud (e.g., openstack)</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                owner-defined-type
+                                            </td>
+                                            <td>
+                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-feature
+                                            </td>
+                                            <td>
+                                               <p>Name of the HPACapability</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                architecture
+                                            </td>
+                                            <td>
+                                               <p>Hardware architecture</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -21942,6 +22909,29 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
+                                    <dt class="sw-response-200">
+                                        200 OK
+                                    
+                                    </dt>
+                                    <dd class="sw-response-200">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>successful operation</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+
+                                                <div class="col-md-6 sw-response-model">
+                                                <div  class="panel panel-definition">
+
+                                                    <div class="panel-body">
+                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                                    </div>
+                                                </div>
+                                                </div>
+
+                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -21964,17 +22954,17 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--patch" class="swagger--panel-operation-patch panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">update an existing hpa-capability</div>
-                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
+                    <div class="operation-summary">create or update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>update an existing hpa-capability</p>
+                        <p>create or update an existing hpa-feature-attributes</p>
              
                      </section>
                         <section class="sw-request-body">
@@ -21983,13 +22973,13 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                          </p>
                                                 <div class="row">
                                              <div class="col-md-6">
-                                                <p><p>hpa-capability object that needs to be created or updated.</p>
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
                          </p>
                                              </div>
                                              <div class="col-md-6 sw-request-model">
                              <div  class="panel panel-definition">
                                  <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-capability">/hpa-capability</a>
+                                            <a class="json-schema-ref" href="#/definitions/hpa-feature-attributes">/hpa-feature-attributes</a>
                                  </div>
                              </div></div>
                                          </div>
@@ -22054,6 +23044,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -22085,23 +23091,35 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch" class="swagger--panel-operation-patch panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing hpa-capability</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
+                    <div class="operation-summary">update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing hpa-capability</p>
+                        <p>update an existing hpa-feature-attributes</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated.</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -22165,12 +23183,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                resource-version
+                                                hpa-attribute-key
                                              </td>
                                              <td>
-                                               <p>resource-version for concurrency</p>
+                                               <p>name of the specific HPA attribute</p>
                                          </td>
-                                            <td>query</td>
+                                            <td>path</td>
                                              <td>
                                                 <span class="json-property-type">string</span>
                                          <span class="json-property-range" title="Value limits"></span>
@@ -22210,19 +23228,24 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get" class="swagger--panel-operation-get panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">returns hpa-feature-attributes</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</strong></h3>
+                    <div class="operation-summary">delete an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>returns hpa-feature-attributes</p>
+                        <p>delete an existing hpa-feature-attributes</p>
              
                      </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -22285,55 +23308,26 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                cloud-type
-                                            </td>
-                                            <td>
-                                               <p>Type of the cloud (e.g., openstack)</p>
-                                        </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                owner-defined-type
+                                                hpa-attribute-key
                                              </td>
                                              <td>
-                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
+                                               <p>name of the specific HPA attribute</p>
                                          </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                hpa-feature
-                                            </td>
-                                            <td>
-                                               <p>Name of the HPACapability</p>
-                                        </td>
-                                            <td>query</td>
+                                            <td>path</td>
                                              <td>
                                                 <span class="json-property-type">string</span>
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
+                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                          <tr>
                                              <td>
-                                                hpa-hw-arch
+                                                resource-version
                                              </td>
                                              <td>
-                                               <p>Hardware architecture</p>
+                                               <p>resource-version for concurrency</p>
                                          </td>
                                              <td>query</td>
                                              <td>
@@ -22341,6 +23335,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
+                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                  </tbody>
@@ -22352,29 +23347,6 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
-                                    <dt class="sw-response-200">
-                                        200 OK
-                                    
-                                    </dt>
-                                    <dd class="sw-response-200">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <p>successful operation</p>
-                                            
-                                                </div>
-                                            </div>
-                                            <div class="row">
-
-                                                <div class="col-md-6 sw-response-model">
-                                                <div  class="panel panel-definition">
-
-                                                    <div class="panel-body">
-                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
-                                                    </div>
-                                                </div>
-                                                </div>
-
-                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -22397,11 +23369,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
                      <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
@@ -22487,6 +23459,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -22518,11 +23506,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
                      <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
@@ -22596,6 +23584,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -177285,8 +178289,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
@@ -177373,11 +178377,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
  
                                  <section class="json-schema-properties">
                                      <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
+                                                 <span class="json-property-required"></span>
                                              </dt>
                                              <dd>
                                                  <p>name of the specific HPA attribute</p>
@@ -177385,8 +178390,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v13.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v13.html

index 0441d6c..f3a3554 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v13.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v13.html
@@ -197,17 +197,32 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--get">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
                          <td><p>returns hpa-feature-attributes</p>
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>create or update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch">PATCH /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>delete an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</a></td>
                          <td><p>see node definition for valid relationships</p>
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</a></td>
                          <td><p>delete an existing relationship</p>
          </td>
                      </tr>
@@ -292,17 +307,32 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--get">GET /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
                          <td><p>returns hpa-feature-attributes</p>
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>create or update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch">PATCH /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>update an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</a></td>
+                        <td><p>delete an existing hpa-feature-attributes</p>
+        </td>
+                    </tr>
+                    <tr>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-put">PUT /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</a></td>
                          <td><p>see node definition for valid relationships</p>
          </td>
                      </tr>
                      <tr>
-                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</a></td>
+                        <td><a href="#operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-delete">DELETE /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</a></td>
                          <td><p>delete an existing relationship</p>
          </td>
                      </tr>
@@ -19136,7 +19166,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                hpa-hw-arch
+                                                architecture
                                              </td>
                                              <td>
                                                 <p>Hardware architecture</p>
@@ -19618,11 +19648,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get" class="swagger--panel-operation-get panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--get" class="swagger--panel-operation-get panel">
                  <div class="panel-heading">
                      <div class="operation-summary">returns hpa-feature-attributes</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
@@ -19707,6 +19737,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                          <tr>
                                              <td>
                                                  cloud-type
@@ -19769,7 +19815,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                hpa-hw-arch
+                                                architecture
                                              </td>
                                              <td>
                                                 <p>Hardware architecture</p>
@@ -19836,17 +19882,17 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">create or update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>see node definition for valid relationships</p>
+                        <p>create or update an existing hpa-feature-attributes</p>
              
                      </section>
                         <section class="sw-request-body">
@@ -19855,13 +19901,13 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                          </p>
                                                 <div class="row">
                                              <div class="col-md-6">
-                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
                          </p>
                                              </div>
                                              <div class="col-md-6 sw-request-model">
                              <div  class="panel panel-definition">
                                  <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
+                                            <a class="json-schema-ref" href="#/definitions/hpa-feature-attributes">/hpa-feature-attributes</a>
                                  </div>
                              </div></div>
                                          </div>
@@ -19942,6 +19988,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -19973,23 +20035,35 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch" class="swagger--panel-operation-patch panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing relationship</p>
+                        <p>update an existing hpa-feature-attributes</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated.</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -20067,6 +20141,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -20098,35 +20188,23 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">delete an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>see node definition for valid relationships</p>
+                        <p>delete an existing hpa-feature-attributes</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
-                                               <div class="row">
-                                            <div class="col-md-6">
-                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapability.json)</p>
-                        </p>
-                                            </div>
-                                            <div class="col-md-6 sw-request-model">
-                            <div  class="panel panel-definition">
-                                <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
-                                </div>
-                            </div></div>
-                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -20204,6 +20282,38 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                resource-version
+                                            </td>
+                                            <td>
+                                               <p>resource-version for concurrency</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -20235,23 +20345,35 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">see node definition for valid relationships</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing relationship</p>
+                        <p>see node definition for valid relationships</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
+                                </div>
+                            </div></div>
+                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -20329,6 +20451,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -20360,35 +20498,23 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">delete an existing relationship</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>see node definition for valid relationships</p>
+                        <p>delete an existing relationship</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
-                                               <div class="row">
-                                            <div class="col-md-6">
-                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor.json)</p>
-                        </p>
-                                            </div>
-                                            <div class="col-md-6 sw-request-model">
-                            <div  class="panel panel-definition">
-                                <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
-                                </div>
-                            </div></div>
-                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -20450,6 +20576,38 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                               <p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -20481,23 +20639,35 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">see node definition for valid relationships</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing relationship</p>
+                        <p>see node definition for valid relationships</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapability.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
+                                </div>
+                            </div></div>
+                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -20559,6 +20729,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                               <p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -20590,17 +20776,372 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-get" class="swagger--panel-operation-get panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--hpa-capabilities-hpa-capability--hpa-capability-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">returns group-assignments</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments</strong></h3>
+                    <div class="operation-summary">delete an existing relationship</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>returns group-assignments</p>
+                        <p>delete an existing relationship</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                               <p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-capability-id
+                                            </td>
+                                            <td>
+                                               <p>UUID to uniquely identify a HPA capability</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">see node definition for valid relationships</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/relationship-list/relationship</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>see node definition for valid relationships</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavor.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                               <p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--flavors-flavor--flavor-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">delete an existing relationship</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/relationship-list/relationship</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>delete an existing relationship</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                flavor-id
+                                            </td>
+                                            <td>
+                                               <p>Flavor id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-get" class="swagger--panel-operation-get panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">returns group-assignments</div>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>returns group-assignments</p>
              
                      </section>
                          <section class="sw-request-params">
@@ -21160,24 +21701,374 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--delete" class="swagger--panel-operation-delete panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">delete an existing group-assignment</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>delete an existing group-assignment</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                group-id
+                                            </td>
+                                            <td>
+                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                resource-version
+                                            </td>
+                                            <td>
+                                               <p>resource-version for concurrency</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">see node definition for valid relationships</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}/relationship-list/relationship</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>see node definition for valid relationships</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                group-id
+                                            </td>
+                                            <td>
+                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+                <div class="panel-heading">
+                    <div class="operation-summary">delete an existing relationship</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}/relationship-list/relationship</strong></h3>
+                        Tags:
+                            <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
+                </div>
+                <div class="panel-body">
+                    <section class="sw-operation-description">
+                        <p>delete an existing relationship</p>
+            
+                    </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
+                        <section class="sw-request-params">
+                            <table class="table">
+                                <thead>
+                                <tr>
+                                    <th class="sw-param-name"></th>
+                                    <th class="sw-param-description"></th>
+                                    <th class="sw-param-type"></th>
+                                    <th class="sw-param-data-type"></th>
+                                    <th class="sw-param-annotation"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                        <tr>
+                                            <td>
+                                                cloud-owner
+                                            </td>
+                                            <td>
+                                               <p>Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-region-id
+                                            </td>
+                                            <td>
+                                               <p>Identifier used by the vendor for the region. Second part of composite key</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                group-id
+                                            </td>
+                                            <td>
+                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                </tbody>
+                            </table>
+                        </section>
+
+                        <section class="sw-responses">
+                                <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                    </p>
+                    
+                            <dl>
+                                <dt class="sw-response-default">
+                                        default 
+                                    
+                                    </dt>
+                                    <dd class="sw-response-default">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>Response codes found in <a href="https://wiki.onap.org/">response codes</a>.</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                
+                                                <div class="col-md-6 sw-response-model">
+                                            </div>
+                                            
+                                            </div>                </dd>
+                            </dl>
+                        </section>
+                </div>
+            </div>    
+        
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-get" class="swagger--panel-operation-get panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing group-assignment</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}</strong></h3>
+                    <div class="operation-summary">returns hpa-capabilities</div>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing group-assignment</p>
+                        <p>returns hpa-capabilities</p>
              
                      </section>
-                       <section class="sw-request-body">
-                                
-                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
-                        </p>
-                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -21224,26 +22115,25 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                group-id
+                                                cloud-type
                                              </td>
                                              <td>
-                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                               <p>Type of the cloud (e.g., openstack)</p>
                                          </td>
-                                            <td>path</td>
+                                            <td>query</td>
                                              <td>
                                                 <span class="json-property-type">string</span>
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
-                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                          <tr>
                                              <td>
-                                                resource-version
+                                                owner-defined-type
                                              </td>
                                              <td>
-                                               <p>resource-version for concurrency</p>
+                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
                                          </td>
                                              <td>query</td>
                                              <td>
@@ -21251,7 +22141,6 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
-                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                  </tbody>
@@ -21263,6 +22152,29 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
+                                    <dt class="sw-response-200">
+                                        200 OK
+                                    
+                                    </dt>
+                                    <dd class="sw-response-200">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>successful operation</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+
+                                                <div class="col-md-6 sw-response-model">
+                                                <div  class="panel panel-definition">
+
+                                                    <div class="panel-body">
+                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-capabilities">/hpa-capabilities</a>
+                                                    </div>
+                                                </div>
+                                                </div>
+
+                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -21285,36 +22197,19 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--get" class="swagger--panel-operation-get panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">returns hpa-capability</div>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>see node definition for valid relationships</p>
+                        <p>returns hpa-capability</p>
              
                      </section>
-                       <section class="sw-request-body">
-                                
-                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
-                        </p>
-                                               <div class="row">
-                                            <div class="col-md-6">
-                                                <p><p>relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionGroupAssignmentsGroupAssignment.json)</p>
-                        </p>
-                                            </div>
-                                            <div class="col-md-6 sw-request-model">
-                            <div  class="panel panel-definition">
-                                <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/definitions/relationship">/relationship</a>
-                                </div>
-                            </div></div>
-                                        </div>
-                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -21361,10 +22256,10 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                group-id
+                                                hpa-capability-id
                                              </td>
                                              <td>
-                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                               <p>UUID to uniquely identify a HPA capability</p>
                                          </td>
                                              <td>path</td>
                                              <td>
@@ -21375,6 +22270,66 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-type
+                                            </td>
+                                            <td>
+                                               <p>Type of the cloud (e.g., openstack)</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                owner-defined-type
+                                            </td>
+                                            <td>
+                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-feature
+                                            </td>
+                                            <td>
+                                               <p>Name of the HPACapability</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                architecture
+                                            </td>
+                                            <td>
+                                               <p>Hardware architecture</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -21384,6 +22339,29 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
+                                    <dt class="sw-response-200">
+                                        200 OK
+                                    
+                                    </dt>
+                                    <dd class="sw-response-200">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>successful operation</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+
+                                                <div class="col-md-6 sw-response-model">
+                                                <div  class="panel panel-definition">
+
+                                                    <div class="panel-body">
+                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-capability">/hpa-capability</a>
+                                                    </div>
+                                                </div>
+                                                </div>
+
+                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -21406,23 +22384,35 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--group-assignments-group-assignment--group-id--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/group-assignments/group-assignment/{group-id}/relationship-list/relationship</strong></h3>
+                    <div class="operation-summary">create or update an existing hpa-capability</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing relationship</p>
+                        <p>create or update an existing hpa-capability</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-capability object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability.json)</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/definitions/hpa-capability">/hpa-capability</a>
+                                </div>
+                            </div></div>
+                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -21470,10 +22460,10 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                group-id
+                                                hpa-capability-id
                                              </td>
                                              <td>
-                                               <p>Group id, expected to be unique across cloud-region.</p>
+                                               <p>UUID to uniquely identify a HPA capability</p>
                                          </td>
                                              <td>path</td>
                                              <td>
@@ -21515,19 +22505,36 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-get" class="swagger--panel-operation-get panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--patch" class="swagger--panel-operation-patch panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">returns hpa-capabilities</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities</strong></h3>
+                    <div class="operation-summary">update an existing hpa-capability</div>
+                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>returns hpa-capabilities</p>
+                        <p>update an existing hpa-capability</p>
              
                      </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-capability object that needs to be created or updated.</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-capability">/hpa-capability</a>
+                                </div>
+                            </div></div>
+                                        </div>
+                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -21574,32 +22581,18 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                cloud-type
-                                            </td>
-                                            <td>
-                                               <p>Type of the cloud (e.g., openstack)</p>
-                                        </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                owner-defined-type
+                                                hpa-capability-id
                                              </td>
                                              <td>
-                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
+                                               <p>UUID to uniquely identify a HPA capability</p>
                                          </td>
-                                            <td>query</td>
+                                            <td>path</td>
                                              <td>
                                                 <span class="json-property-type">string</span>
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
+                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                  </tbody>
@@ -21611,29 +22604,6 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
-                                    <dt class="sw-response-200">
-                                        200 OK
-                                    
-                                    </dt>
-                                    <dd class="sw-response-200">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <p>successful operation</p>
-                                            
-                                                </div>
-                                            </div>
-                                            <div class="row">
-
-                                                <div class="col-md-6 sw-response-model">
-                                                <div  class="panel panel-definition">
-
-                                                    <div class="panel-body">
-                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-capabilities">/hpa-capabilities</a>
-                                                    </div>
-                                                </div>
-                                                </div>
-
-                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -21657,18 +22627,23 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
              </div>    
          
          <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--get" class="swagger--panel-operation-get panel">
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">returns hpa-capability</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
+                    <div class="operation-summary">delete an existing hpa-capability</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>returns hpa-capability</p>
+                        <p>delete an existing hpa-capability</p>
              
                      </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -21731,55 +22706,10 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                cloud-type
-                                            </td>
-                                            <td>
-                                               <p>Type of the cloud (e.g., openstack)</p>
-                                        </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                owner-defined-type
-                                            </td>
-                                            <td>
-                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
-                                        </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                hpa-feature
-                                            </td>
-                                            <td>
-                                               <p>Name of the HPACapability</p>
-                                        </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                hpa-hw-arch
+                                                resource-version
                                              </td>
                                              <td>
-                                               <p>Hardware architecture</p>
+                                               <p>resource-version for concurrency</p>
                                          </td>
                                              <td>query</td>
                                              <td>
@@ -21787,6 +22717,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
+                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                  </tbody>
@@ -21798,29 +22729,6 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
-                                    <dt class="sw-response-200">
-                                        200 OK
-                                    
-                                    </dt>
-                                    <dd class="sw-response-200">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <p>successful operation</p>
-                                            
-                                                </div>
-                                            </div>
-                                            <div class="row">
-
-                                                <div class="col-md-6 sw-response-model">
-                                                <div  class="panel panel-definition">
-
-                                                    <div class="panel-body">
-                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-capability">/hpa-capability</a>
-                                                    </div>
-                                                </div>
-                                                </div>
-
-                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -21843,36 +22751,19 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--get" class="swagger--panel-operation-get panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">create or update an existing hpa-capability</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
+                    <div class="operation-summary">returns hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>create or update an existing hpa-capability</p>
+                        <p>returns hpa-feature-attributes</p>
              
                      </section>
-                       <section class="sw-request-body">
-                                
-                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
-                        </p>
-                                               <div class="row">
-                                            <div class="col-md-6">
-                                                <p><p>hpa-capability object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapability.json)</p>
-                        </p>
-                                            </div>
-                                            <div class="col-md-6 sw-request-model">
-                            <div  class="panel panel-definition">
-                                <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/definitions/hpa-capability">/hpa-capability</a>
-                                </div>
-                            </div></div>
-                                        </div>
-                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -21933,6 +22824,82 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                cloud-type
+                                            </td>
+                                            <td>
+                                               <p>Type of the cloud (e.g., openstack)</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                owner-defined-type
+                                            </td>
+                                            <td>
+                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-feature
+                                            </td>
+                                            <td>
+                                               <p>Name of the HPACapability</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                architecture
+                                            </td>
+                                            <td>
+                                               <p>Hardware architecture</p>
+                                        </td>
+                                            <td>query</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -21942,6 +22909,29 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
+                                    <dt class="sw-response-200">
+                                        200 OK
+                                    
+                                    </dt>
+                                    <dd class="sw-response-200">
+                                            <div class="row">
+                                                <div class="col-md-12">
+                                                    <p>successful operation</p>
+                                            
+                                                </div>
+                                            </div>
+                                            <div class="row">
+
+                                                <div class="col-md-6 sw-response-model">
+                                                <div  class="panel panel-definition">
+
+                                                    <div class="panel-body">
+                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                                    </div>
+                                                </div>
+                                                </div>
+
+                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -21964,17 +22954,17 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--patch" class="swagger--panel-operation-patch panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">update an existing hpa-capability</div>
-                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
+                    <div class="operation-summary">create or update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>update an existing hpa-capability</p>
+                        <p>create or update an existing hpa-feature-attributes</p>
              
                      </section>
                         <section class="sw-request-body">
@@ -21983,13 +22973,13 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                          </p>
                                                 <div class="row">
                                              <div class="col-md-6">
-                                                <p><p>hpa-capability object that needs to be created or updated.</p>
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)</p>
                          </p>
                                              </div>
                                              <div class="col-md-6 sw-request-model">
                              <div  class="panel panel-definition">
                                  <div class="panel-body">
-                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-capability">/hpa-capability</a>
+                                            <a class="json-schema-ref" href="#/definitions/hpa-feature-attributes">/hpa-feature-attributes</a>
                                  </div>
                              </div></div>
                                          </div>
@@ -22054,6 +23044,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -22085,23 +23091,35 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--patch" class="swagger--panel-operation-patch panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">delete an existing hpa-capability</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}</strong></h3>
+                    <div class="operation-summary">update an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">PATCH</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>delete an existing hpa-capability</p>
+                        <p>update an existing hpa-feature-attributes</p>
              
                      </section>
                         <section class="sw-request-body">
                                  
                                      <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
                          </p>
+                                               <div class="row">
+                                            <div class="col-md-6">
+                                                <p><p>hpa-feature-attributes object that needs to be created or updated.</p>
+                        </p>
+                                            </div>
+                                            <div class="col-md-6 sw-request-model">
+                            <div  class="panel panel-definition">
+                                <div class="panel-body">
+                                            <a class="json-schema-ref" href="#/patchDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
+                                </div>
+                            </div></div>
+                                        </div>
                              </section>
                          <section class="sw-request-params">
                              <table class="table">
@@ -22165,12 +23183,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                resource-version
+                                                hpa-attribute-key
                                              </td>
                                              <td>
-                                               <p>resource-version for concurrency</p>
+                                               <p>name of the specific HPA attribute</p>
                                          </td>
-                                            <td>query</td>
+                                            <td>path</td>
                                              <td>
                                                 <span class="json-property-type">string</span>
                                          <span class="json-property-range" title="Value limits"></span>
@@ -22210,19 +23228,24 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-get" class="swagger--panel-operation-get panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
-                    <div class="operation-summary">returns hpa-feature-attributes</div>
-                    <h3 class="panel-title"><span class="operation-name">GET</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes</strong></h3>
+                    <div class="operation-summary">delete an existing hpa-feature-attributes</div>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
                  <div class="panel-body">
                      <section class="sw-operation-description">
-                        <p>returns hpa-feature-attributes</p>
+                        <p>delete an existing hpa-feature-attributes</p>
              
                      </section>
+                       <section class="sw-request-body">
+                                
+                                    <p><span class="label label-default">application/json</span> <span class="label label-default">application/xml</span> 
+                        </p>
+                            </section>
                          <section class="sw-request-params">
                              <table class="table">
                                  <thead>
@@ -22285,55 +23308,26 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          </tr>
                                          <tr>
                                              <td>
-                                                cloud-type
-                                            </td>
-                                            <td>
-                                               <p>Type of the cloud (e.g., openstack)</p>
-                                        </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                owner-defined-type
+                                                hpa-attribute-key
                                              </td>
                                              <td>
-                                               <p>Cloud-owner defined type indicator (e.g., dcp, lcp)</p>
+                                               <p>name of the specific HPA attribute</p>
                                          </td>
-                                            <td>query</td>
-                                            <td>
-                                               <span class="json-property-type">string</span>
-                                        <span class="json-property-range" title="Value limits"></span>
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                hpa-feature
-                                            </td>
-                                            <td>
-                                               <p>Name of the HPACapability</p>
-                                        </td>
-                                            <td>query</td>
+                                            <td>path</td>
                                              <td>
                                                 <span class="json-property-type">string</span>
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
+                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                          <tr>
                                              <td>
-                                                hpa-hw-arch
+                                                resource-version
                                              </td>
                                              <td>
-                                               <p>Hardware architecture</p>
+                                               <p>resource-version for concurrency</p>
                                          </td>
                                              <td>query</td>
                                              <td>
@@ -22341,6 +23335,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                          <span class="json-property-range" title="Value limits"></span>
                                              </td>
                                              <td>
+                                                    <span class="json-property-required"></span>
                                              </td>
                                          </tr>
                                  </tbody>
@@ -22352,29 +23347,6 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                      </p>
                      
                              <dl>
-                                    <dt class="sw-response-200">
-                                        200 OK
-                                    
-                                    </dt>
-                                    <dd class="sw-response-200">
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <p>successful operation</p>
-                                            
-                                                </div>
-                                            </div>
-                                            <div class="row">
-
-                                                <div class="col-md-6 sw-response-model">
-                                                <div  class="panel panel-definition">
-
-                                                    <div class="panel-body">
-                                                        <a class="json-schema-ref" href="#/getDefinitions/hpa-feature-attributes">/hpa-feature-attributes</a>
-                                                    </div>
-                                                </div>
-                                                </div>
-
-                                            </div>                </dd>
                                  <dt class="sw-response-default">
                                          default 
                                      
@@ -22397,11 +23369,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-put" class="swagger--panel-operation-put panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-put" class="swagger--panel-operation-put panel">
                  <div class="panel-heading">
                      <div class="operation-summary">see node definition for valid relationships</div>
-                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">PUT</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
@@ -22487,6 +23459,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -22518,11 +23506,11 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                  </div>
              </div>    
          
-        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-"></span>
-            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes-relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
+        <span id="path--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-"></span>
+            <div id="operation--cloud-infrastructure-cloud-regions-cloud-region--cloud-owner---cloud-region-id--hpa-capabilities-hpa-capability--hpa-capability-id--hpa-feature-attributes--hpa-attribute-key--relationship-list-relationship-delete" class="swagger--panel-operation-delete panel">
                  <div class="panel-heading">
                      <div class="operation-summary">delete an existing relationship</div>
-                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship</strong></h3>
+                    <h3 class="panel-title"><span class="operation-name">DELETE</span> <strong>/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship</strong></h3>
                          Tags:
                              <a href="#tag-CloudInfrastructure">CloudInfrastructure</a>
                  </div>
@@ -22596,6 +23584,22 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      <span class="json-property-required"></span>
                                              </td>
                                          </tr>
+                                        <tr>
+                                            <td>
+                                                hpa-attribute-key
+                                            </td>
+                                            <td>
+                                               <p>name of the specific HPA attribute</p>
+                                        </td>
+                                            <td>path</td>
+                                            <td>
+                                               <span class="json-property-type">string</span>
+                                        <span class="json-property-range" title="Value limits"></span>
+                                            </td>
+                                            <td>
+                                                    <span class="json-property-required"></span>
+                                            </td>
+                                        </tr>
                                  </tbody>
                              </table>
                          </section>
@@ -177285,8 +178289,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
@@ -177373,11 +178377,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
  
                                  <section class="json-schema-properties">
                                      <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
+                                                 <span class="json-property-required"></span>
                                              </dt>
                                              <dd>
                                                  <p>name of the specific HPA attribute</p>
@@ -177385,8 +178390,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v8.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v8.html

index ae582f2..7921d30 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v8.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v8.html
@@ -143165,8 +143165,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
@@ -143253,11 +143253,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
  
                                  <section class="json-schema-properties">
                                      <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
+                                                 <span class="json-property-required"></span>
                                              </dt>
                                              <dd>
                                                  <p>name of the specific HPA attribute</p>
@@ -143265,8 +143266,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v9.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v9.html

index 80444e1..7d20a78 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v9.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v9.html
@@ -155467,8 +155467,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-hw-arch">
-                                                <span class="json-property-name">hpa-hw-arch:</span>
+                                            <dt data-property-name="architecture">
+                                                <span class="json-property-name">architecture:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
@@ -155555,11 +155555,12 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
  
                                  <section class="json-schema-properties">
                                      <dl>
-                                            <dt data-property-name="hpa-attr-key">
-                                                <span class="json-property-name">hpa-attr-key:</span>
+                                            <dt data-property-name="hpa-attribute-key">
+                                                <span class="json-property-name">hpa-attribute-key:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
+                                                 <span class="json-property-required"></span>
                                              </dt>
                                              <dd>
                                                  <p>name of the specific HPA attribute</p>
@@ -155567,8 +155568,8 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                      
                                                  </div>
                                              </dd>
-                                            <dt data-property-name="hpa-attr-value">
-                                                <span class="json-property-name">hpa-attr-value:</span>
+                                            <dt data-property-name="hpa-attribute-value">
+                                                <span class="json-property-name">hpa-attribute-value:</span>
                                                  <span class="json-property-type">string</span>
                                                  <span class="json-property-range" title="Value limits"></span>
                                                  
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v10.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v10.yaml

index 9842549..ac8969d 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v10.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v10.yaml
@@ -50036,7 +50036,7 @@ definitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -50055,11 +50055,13 @@ definitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
@@ -54942,7 +54944,7 @@ patchDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
    hpa-feature-attributes:
@@ -54950,11 +54952,13 @@ patchDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
    image:
@@ -59345,7 +59349,7 @@ getDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -59364,11 +59368,13 @@ getDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml

index 7b6536a..10d0626 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml
@@ -54066,7 +54066,7 @@ definitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -54085,11 +54085,13 @@ definitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
@@ -59200,7 +59202,7 @@ patchDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
    hpa-feature-attributes:
@@ -59208,11 +59210,13 @@ patchDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
    image:
@@ -63815,7 +63819,7 @@ getDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -63834,11 +63838,13 @@ getDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v12.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v12.yaml

index db6978d..130578d 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v12.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v12.yaml
@@ -5362,7 +5362,7 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship:
      put:
        tags:
          - CloudInfrastructure
@@ -5402,6 +5402,12 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
          - name: body
            in: body
            description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
@@ -5448,7 +5454,13 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes:
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}:
      get:
        tags:
          - CloudInfrastructure
@@ -5490,6 +5502,12 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
          - name: cloud-type
            in: query
            description: Type of the cloud (e.g., openstack)
@@ -5510,11 +5528,180 @@ paths:
            description: Name of the HPACapability
            required: false
            type: string
-        - name: hpa-hw-arch
+        - name: architecture
            in: query
            description: Hardware architecture
            required: false
            type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing hpa-feature-attributes
+      description: |
+        Create or update an existing hpa-feature-attributes.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing hpa-feature-attributes
+      description: |
+        Update an existing hpa-feature-attributes
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. 
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing hpa-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
    /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}:
      get:
        tags:
@@ -5577,7 +5764,7 @@ paths:
            description: Name of the HPACapability
            required: false
            type: string
-        - name: hpa-hw-arch
+        - name: architecture
            in: query
            description: Hardware architecture
            required: false
@@ -8870,7 +9057,7 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship:
      put:
        tags:
          - CloudInfrastructure
@@ -8904,6 +9091,12 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
          - name: body
            in: body
            description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
@@ -8944,7 +9137,13 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes:
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}:
      get:
        tags:
          - CloudInfrastructure
@@ -8980,6 +9179,12 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
          - name: cloud-type
            in: query
            description: Type of the cloud (e.g., openstack)
@@ -8995,11 +9200,162 @@ paths:
            description: Name of the HPACapability
            required: false
            type: string
-        - name: hpa-hw-arch
+        - name: architecture
            in: query
            description: Hardware architecture
            required: false
            type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing hpa-feature-attributes
+      description: |
+        Create or update an existing hpa-feature-attributes.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v12/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing hpa-feature-attributes
+      description: |
+        Update an existing hpa-feature-attributes
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. 
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing hpa-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
    /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}:
      get:
        tags:
@@ -9051,7 +9407,7 @@ paths:
            description: Name of the HPACapability
            required: false
            type: string
-        - name: hpa-hw-arch
+        - name: architecture
            in: query
            description: Hardware architecture
            required: false
@@ -55924,7 +56280,7 @@ definitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -55943,11 +56299,13 @@ definitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
@@ -61117,7 +61475,7 @@ patchDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
    hpa-feature-attributes:
@@ -61125,11 +61483,13 @@ patchDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
    image:
@@ -65799,7 +66159,7 @@ getDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -65818,11 +66178,13 @@ getDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v13.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v13.yaml

index 08e7daf..976f1aa 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v13.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v13.yaml
@@ -5362,7 +5362,7 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship:
      put:
        tags:
          - CloudInfrastructure
@@ -5402,6 +5402,12 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
          - name: body
            in: body
            description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
@@ -5448,7 +5454,13 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes:
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}:
      get:
        tags:
          - CloudInfrastructure
@@ -5490,6 +5502,12 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
          - name: cloud-type
            in: query
            description: Type of the cloud (e.g., openstack)
@@ -5510,11 +5528,180 @@ paths:
            description: Name of the HPACapability
            required: false
            type: string
-        - name: hpa-hw-arch
+        - name: architecture
            in: query
            description: Hardware architecture
            required: false
            type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing hpa-feature-attributes
+      description: |
+        Create or update an existing hpa-feature-attributes.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing hpa-feature-attributes
+      description: |
+        Update an existing hpa-feature-attributes
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. 
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing hpa-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionFlavorsFlavorHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: flavor-id
+          in: path
+          description: Flavor id, expected to be unique across cloud-region.
+          required: true
+          type: string
+          example: __FLAVOR-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
    /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/flavors/flavor/{flavor-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}:
      get:
        tags:
@@ -5577,7 +5764,7 @@ paths:
            description: Name of the HPACapability
            required: false
            type: string
-        - name: hpa-hw-arch
+        - name: architecture
            in: query
            description: Hardware architecture
            required: false
@@ -8870,7 +9057,7 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/relationship-list/relationship:
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}/relationship-list/relationship:
      put:
        tags:
          - CloudInfrastructure
@@ -8904,6 +9091,12 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
          - name: body
            in: body
            description: relationship object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
@@ -8944,7 +9137,13 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
-  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes:
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+  /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}/hpa-feature-attributes/{hpa-attribute-key}:
      get:
        tags:
          - CloudInfrastructure
@@ -8980,6 +9179,12 @@ paths:
            required: true
            type: string
            example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
          - name: cloud-type
            in: query
            description: Type of the cloud (e.g., openstack)
@@ -8995,11 +9200,162 @@ paths:
            description: Name of the HPACapability
            required: false
            type: string
-        - name: hpa-hw-arch
+        - name: architecture
            in: query
            description: Hardware architecture
            required: false
            type: string
+    put:
+      tags:
+        - CloudInfrastructure
+      summary: create or update an existing hpa-feature-attributes
+      description: |
+        Create or update an existing hpa-feature-attributes.
+        #
+        Note! This PUT method has a corresponding PATCH method that can be used to update just a few of the fields of an existing object, rather than a full object replacement.  An example can be found in the [PATCH section] below
+      operationId: createOrUpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. [Valid relationship examples shown here](apidocs/relations/v13/CloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes.json)
+          required: true
+          schema:
+            $ref: "#/definitions/hpa-feature-attributes"
+    patch:
+      tags:
+        - CloudInfrastructure
+      summary: update an existing hpa-feature-attributes
+      description: |
+        Update an existing hpa-feature-attributes
+        #
+        Note:  Endpoints that are not devoted to object relationships support both PUT and PATCH operations.
+        The PUT operation will entirely replace an existing object.
+        The PATCH operation sends a "description of changes" for an existing object.  The entire set of changes must be applied.  An error result means no change occurs.
+        #
+        Other differences between PUT and PATCH are:
+        #
+        - For PATCH, you can send any of the values shown in sample REQUEST body.  There are no required values.
+        - For PATCH, resource-id which is a required REQUEST body element for PUT, must not be sent.
+        - PATCH cannot be used to update relationship elements; there are dedicated PUT operations for this.
+      operationId: UpdateCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: body
+          in: body
+          description: hpa-feature-attributes object that needs to be created or updated. 
+          required: true
+          schema:
+            $ref: "#/patchDefinitions/hpa-feature-attributes"
+    delete:
+      tags:
+        - CloudInfrastructure
+      summary: delete an existing hpa-feature-attributes
+      description: delete an existing hpa-feature-attributes
+      operationId: deleteCloudInfrastructureCloudRegionsCloudRegionHpaCapabilitiesHpaCapabilityHpaFeatureAttributes
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        "default":
+          description: Response codes found in [response codes](https://wiki.onap.org/).
+      parameters:
+        - name: cloud-owner
+          in: path
+          description: Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname
+          required: true
+          type: string
+          example: __CLOUD-OWNER__
+        - name: cloud-region-id
+          in: path
+          description: Identifier used by the vendor for the region. Second part of composite key
+          required: true
+          type: string
+          example: __CLOUD-REGION-ID__
+        - name: hpa-capability-id
+          in: path
+          description: UUID to uniquely identify a HPA capability
+          required: true
+          type: string
+          example: __HPA-CAPABILITY-ID__
+        - name: hpa-attribute-key
+          in: path
+          description: name of the specific HPA attribute
+          required: true
+          type: string
+          example: __HPA-ATTRIBUTE-KEY__
+        - name: resource-version
+          in: query
+          description: resource-version for concurrency
+          required: true
+          type: string
    /cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/hpa-capabilities/hpa-capability/{hpa-capability-id}:
      get:
        tags:
@@ -9051,7 +9407,7 @@ paths:
            description: Name of the HPACapability
            required: false
            type: string
-        - name: hpa-hw-arch
+        - name: architecture
            in: query
            description: Hardware architecture
            required: false
@@ -55924,7 +56280,7 @@ definitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -55943,11 +56299,13 @@ definitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
@@ -61117,7 +61475,7 @@ patchDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
    hpa-feature-attributes:
@@ -61125,11 +61483,13 @@ patchDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
    image:
@@ -65799,7 +66159,7 @@ getDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -65818,11 +66178,13 @@ getDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v8.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v8.yaml

index eaf4d79..991c39b 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v8.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v8.yaml
@@ -45146,7 +45146,7 @@ definitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -45165,11 +45165,13 @@ definitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
@@ -49866,7 +49868,7 @@ patchDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
    hpa-feature-attributes:
@@ -49874,11 +49876,13 @@ patchDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
    image:
@@ -54115,7 +54119,7 @@ getDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -54134,11 +54138,13 @@ getDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v9.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v9.yaml

index 61d8af6..1fc4e0d 100644 (file)
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v9.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v9.yaml
@@ -49103,7 +49103,7 @@ definitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -49122,11 +49122,13 @@ definitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
@@ -53973,7 +53975,7 @@ patchDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
    hpa-feature-attributes:
@@ -53981,11 +53983,13 @@ patchDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
    image:
@@ -58323,7 +58327,7 @@ getDefinitions:
        hpa-version:
          type: string
          description: HPA schema version
-      hpa-hw-arch:
+      architecture:
          type: string
          description: Hardware architecture
        resource-version:
@@ -58342,11 +58346,13 @@ getDefinitions:
        HPA Capability Feature attributes
        ###### Related Nodes
        - TO hpa-capability( hpa-feature-attributes org.onap.relationships.inventory.BelongsTo hpa-capability, MANY2ONE)
+    required:
+    - hpa-attribute-key
      properties:
-      hpa-attr-key:
+      hpa-attribute-key:
          type: string
          description: name of the specific HPA attribute
-      hpa-attr-value:
+      hpa-attribute-value:
          type: string
          description: JSON string specifying the value, unit and type of the specific HPA attribute
        resource-version:
diff --git a/aai-auth/License.txt b/aai-utils/LICENSE.TXT

similarity index 84%

rename from aai-auth/License.txt

rename to aai-utils/LICENSE.TXT

index df5d92a..eb76ea4 100644 (file)
--- a/aai-auth/License.txt
+++ b/aai-utils/LICENSE.TXT
@@ -1,9 +1,8 @@
  ============LICENSE_START=======================================================
-EcompAuth
+org.onap.aai
  ================================================================================
-Copyright © 2017 AT&T Intellectual Property.
+Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  Copyright © 2017 Amdocs
-All rights reserved.
  ================================================================================
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -17,6 +16,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  ============LICENSE_END=========================================================
-
-ECOMP and OpenECOMP are trademarks
-and service marks of AT&T Intellectual Property.
diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml

index 5d50d7d..4e97644 100644 (file)
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -1,4 +1,26 @@
  <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+    Copyright © 2017 Amdocs
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
  <project xmlns="http://maven.apache.org/POM/4.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -77,21 +99,6 @@
              <plugin>
                  <groupId>com.mycila</groupId>
                  <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>License.txt</header>
-                    <includes>
-                        <include>src/main/java/**</include>
-                    </includes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
              </plugin>
  
              <plugin>
diff --git a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java

index 9b78592..4ced1b5 100644 (file)
--- a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java
+++ b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java
@@ -2,8 +2,8 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
- * Copyright © 2017 Amdocs
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Copyright © 2017-2018 Amdocs
   * All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aaiutils.oxm;
  
diff --git a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java

index 0f8a54f..8f24edb 100644 (file)
--- a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java
+++ b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java
@@ -2,8 +2,8 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
- * Copyright © 2017 Amdocs
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Copyright © 2017-2018 Amdocs
   * All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aaiutils.oxm;
  
diff --git a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java

index 4f9a268..48eeac0 100644 (file)
--- a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java
+++ b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java
@@ -2,8 +2,8 @@
   * ============LICENSE_START=======================================================
   * org.onap.aai
   * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
- * Copyright © 2017 Amdocs
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Copyright © 2017-2018 Amdocs
   * All rights reserved.
   * ================================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,6 @@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
   */
  package org.onap.aaiutils.oxm;
  
diff --git a/pom.xml b/pom.xml

index 7459026..66392c3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,25 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
      <parent>
@@ -19,14 +40,14 @@
          <module>aai-annotations</module>
          <module>aai-core</module>
          <module>aai-auth</module>
-           <module>aai-utils</module>
+        <module>aai-utils</module>
          <module>aai-client-loadbalancer</module>
-       <module>aai-schema-ingest</module>
+        <module>aai-schema-ingest</module>
      </modules>
  
      <properties>
          <sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath>
-       <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
      </properties>
  
      <build>
@@ -62,6 +83,30 @@
                          <serverId>ecomp-staging</serverId>
                      </configuration>
                  </plugin>
+                <plugin>
+                    <groupId>com.mycila</groupId>
+                    <artifactId>license-maven-plugin</artifactId>
+                    <version>3.0</version>
+                    <configuration>
+                        <header>LICENSE.TXT</header>
+                        <includes>
+                            <include>src/main/java/**</include>
+                            <include>src/test/java/**</include>
+                            <include>pom.xml</include>
+                        </includes>
+                        <skipExistingHeaders>true</skipExistingHeaders>
+                        <skip>false</skip>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <!-- Set goal to "format" to auto update license headers -->
+                                <goal>check</goal>
+                            </goals>
+                            <phase>process-sources</phase>
+                        </execution>
+                    </executions>
+                </plugin>
              </plugins>
          </pluginManagement>
          <plugins>
@@ -69,30 +114,30 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-site-plugin</artifactId>
                  <version>3.6</version>
-               <configuration>
-                   <reportPlugins>
-                       <plugin>
-                       <groupId>org.apache.maven.plugins</groupId>
-                       <artifactId>maven-project-info-reports-plugin</artifactId>
-                       <version>2.4</version>
-                       <configuration>
-                           <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-                           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-                       </configuration>
-                       <reports>
-                           <report>dependencies</report>
-                       </reports>
-                       </plugin>
-                       <plugin>
-                       <groupId>org.apache.maven.plugins</groupId>
-                       <artifactId>maven-javadoc-plugin</artifactId>
-                       <version>2.8</version>
-                       <configuration>
-                           <additionalparam>-Xdoclint:none</additionalparam>
-                       </configuration>
-                       </plugin>
-                   </reportPlugins>
-               </configuration>
+                <configuration>
+                    <reportPlugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-project-info-reports-plugin</artifactId>
+                            <version>2.4</version>
+                            <configuration>
+                                <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                                <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                            </configuration>
+                            <reports>
+                                <report>dependencies</report>
+                            </reports>
+                        </plugin>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-javadoc-plugin</artifactId>
+                            <version>2.8</version>
+                            <configuration>
+                                <additionalparam>-Xdoclint:none</additionalparam>
+                            </configuration>
+                        </plugin>
+                    </reportPlugins>
+                </configuration>
                  <dependencies>
                      <dependency>
                          <groupId>org.apache.maven.wagon</groupId>
@@ -101,6 +146,10 @@
                      </dependency>
                  </dependencies>
              </plugin>
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+            </plugin>
          </plugins>
      </build>
author	Kajur, Harish (vk250x) <vk250x@att.com>
	Wed, 21 Mar 2018 13:14:41 +0000 (09:14 -0400)
committer	Kajur, Harish (vk250x) <vk250x@att.com>
	Thu, 22 Mar 2018 05:16:47 +0000 (01:16 -0400)