diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-03-31 19:56:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-03-31 19:56:36 +0000 |
| commit | d0bd5cbcb5ffe3e874d7966303cced24ee1cc61c (patch) | |
| tree | 678f2690cdde439487e31e55f1e63340ca4b5c14 | |
| parent | caf4fa65af7c10196dcba855db04c78219d733f6 (diff) | |
| parent | 127f24ee8e0fffaab12919cd4195775f5ba08f28 (diff) | |
Merge "[SDNC-5] summary"
200 files changed, 4169 insertions, 2972 deletions
diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml index a36788b..1975c25 100755 --- a/aai-service/provider/pom.xml +++ b/aai-service/provider/pom.xml @@ -110,7 +110,14 @@ <build> <plugins> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> <plugin> <groupId>org.apache.felix</groupId> @@ -121,10 +128,8 @@ <instructions> <Bundle-SymbolicName>org.openecomp.sdnc.sli.aai</Bundle-SymbolicName> <Bundle-Activator>org.openecomp.sdnc.sli.aai.AAIServiceActivator</Bundle-Activator> - <Export-Package>org.openecomp.sdnc.sli.aai.*,inventory.aai.sdnc.openecomp.org.v8.*</Export-Package> - <Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,org.apache.commons.lang3.*,javax.xml.bind.annotation.*,javax.ws.rs.*,javax.ws.rs.core.*,com.fasterxml.jackson.module.jaxb.*,com.sun.jersey.client.urlconnection.*,com.sun.jersey.api.client.config.*,com.fasterxml.jackson.databind.type.*,com.fasterxml.jackson.module.jaxb.*,com.fasterxml.jackson.databind.introspect.*,com.fasterxml.jackson.annotation.*,com.fasterxml.jackson.databind.*</Import-Package> - <!-- <Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*</Import-Package> --> - <!-- <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mysql-connector-java|xml-apis</Embed-Dependency> --> + <Export-Package>org.openecomp.sdnc.sli.aai.*,inventory.aai.sdnc.openecomp.org.*</Export-Package> + <Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,org.apache.commons.lang3.*,javax.xml.bind.annotation.*,javax.ws.rs.*,javax.ws.rs.core.*,com.fasterxml.jackson.module.jaxb.*,com.sun.jersey.client.urlconnection.*,com.sun.jersey.api.client.config.*,com.fasterxml.jackson.databind.type.*,com.fasterxml.jackson.module.jaxb.*,com.fasterxml.jackson.databind.introspect.*,com.fasterxml.jackson.annotation.*,com.fasterxml.jackson.databind.*</Import-Package> <Import-Package>*</Import-Package> <Embed-Transitive>true</Embed-Transitive> </instructions> diff --git a/aai-service/provider/src/main/java/META-INF/sun-jaxb.episode b/aai-service/provider/src/main/java/META-INF/sun-jaxb.episode index f14c7d4..ec161a0 100755 --- a/aai-service/provider/src/main/java/META-INF/sun-jaxb.episode +++ b/aai-service/provider/src/main/java/META-INF/sun-jaxb.episode @@ -5,7 +5,7 @@ This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> Any modifications to this file will be lost upon recompilation of the source schema. -Generated on: 2017.02.21 at 07:59:51 PM EST +Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 --> <bindings xmlns:tns="http://org.openecomp.aai.inventory/v8" if-exists="true" scd="x-schema::tns"> diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AaiInternal.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AaiInternal.java index 917a862..2a21b6b 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AaiInternal.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AaiInternal.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Action.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Action.java index 03e76d4..75b9a8e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Action.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Action.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ActionData.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ActionData.java index 96da080..d47cb74 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ActionData.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ActionData.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Actions.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Actions.java index 705bb9d..6ef17f7 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Actions.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Actions.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZone.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZone.java index bbd3720..6dfc43a 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZone.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZone.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZones.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZones.java index a152152..9d26ee3 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZones.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/AvailabilityZones.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Business.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Business.java index 4d9a478..41d89d1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Business.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Business.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudInfrastructure.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudInfrastructure.java index b8d7a85..c2c2ee1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudInfrastructure.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudInfrastructure.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegion.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegion.java index c213d73..031702a 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegion.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegion.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegions.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegions.java index 51f7422..220252f 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegions.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CloudRegions.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSet.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSet.java index 46848c0..878679a 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSet.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSet.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSets.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSets.java index ce75de3..3f9009a 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSets.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ConstrainedElementSets.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignment.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignment.java index 71df413..ca51b8e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignment.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignment.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignments.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignments.java index e786e79..62023f1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignments.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/CtagAssignments.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customer.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customer.java index e7c86d8..5295f27 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customer.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customer.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customers.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customers.java index 72ab34d..191e333 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customers.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Customers.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/EdgePropNames.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/EdgePropNames.java index f851caf..8d1e984 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/EdgePropNames.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/EdgePropNames.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSet.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSet.java index f487b08..1b8aa1d 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSet.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSet.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSets.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSets.java index 0540c53..6a88c0b 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSets.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ElementChoiceSets.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperties.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperties.java index f2cb270..eb3af33 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperties.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperties.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperty.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperty.java index fd50b74..b1d8866 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperty.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ExtraProperty.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavor.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavor.java index d4d4e6c..c0bf5d2 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavor.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavor.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavors.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavors.java index 30a5abf..2fd65da 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavors.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Flavors.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnf.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnf.java index 5210ad1..c100ee4 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnf.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnf.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnfs.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnfs.java index 94d47b1..98c1b74 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnfs.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GenericVnfs.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignment.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignment.java index 0257243..cd5dd56 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignment.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignment.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignments.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignments.java index a7932d6..6e5d249 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignments.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/GroupAssignments.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Image.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Image.java index b3a9a04..f7a792a 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Image.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Image.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Images.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Images.java index 9a2c180..f616213 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Images.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Images.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/IncludeNodeFilter.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/IncludeNodeFilter.java index 3e16f4d..41b46c1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/IncludeNodeFilter.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/IncludeNodeFilter.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilter.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilter.java index 76860a9..5077c48 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilter.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilter.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilters.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilters.java index 687e4ef..4d4b9cc 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilters.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InstanceFilters.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Inventory.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Inventory.java index a39ee57..4ad1de1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Inventory.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Inventory.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItem.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItem.java index 29f5d48..ad34c65 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItem.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItem.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItemData.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItemData.java index cfe5313..633e331 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItemData.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryItemData.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItem.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItem.java index 74fc4e3..f6db4e2 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItem.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItem.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItems.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItems.java index d7ef70b..4495909 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItems.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/InventoryResponseItems.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/KeyData.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/KeyData.java index 61443ed..fa194c0 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/KeyData.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/KeyData.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv4AddressList.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv4AddressList.java index ded36eb..4c214bb 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv4AddressList.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv4AddressList.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv6AddressList.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv6AddressList.java index cdeb67e..4088ee7 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv6AddressList.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3InterfaceIpv6AddressList.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Network.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Network.java index 71afa81..e1de3ba 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Network.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Network.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Networks.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Networks.java index c134d45..7545e28 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Networks.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/L3Networks.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterface.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterface.java index b7b93b9..4f8d28d 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterface.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterface.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterfaces.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterfaces.java index 745d1bc..3609909 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterfaces.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LInterfaces.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterface.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterface.java index f98c3e4..fb8f0ab 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterface.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterface.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterfaces.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterfaces.java index 3b77637..8edd6b7 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterfaces.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LagInterfaces.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLink.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLink.java index 1ad1b7c..5bb3c95 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLink.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLink.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLinks.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLinks.java index 7030a4b..916a012 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLinks.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/LogicalLinks.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadata.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadata.java index db52be3..512cc83 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadata.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadata.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadatum.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadatum.java index b57929c..2d407ef 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadatum.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Metadatum.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Model.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Model.java index 7676eea..f802b11 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Model.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Model.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelAndNamedQuerySearch.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelAndNamedQuerySearch.java index fa95b25..89581aa 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelAndNamedQuerySearch.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelAndNamedQuerySearch.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraint.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraint.java index d6d1de0..f93d14b 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraint.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraint.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraints.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraints.java index 07a6b3f..8b17467 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraints.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelConstraints.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElement.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElement.java index c657caa..819bbd9 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElement.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElement.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElements.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElements.java index 6b8a187..c6d6056 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElements.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ModelElements.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Models.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Models.java index 842ab42..628dfe1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Models.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Models.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueries.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueries.java index 7bdab7b..057dd6b 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueries.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueries.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQuery.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQuery.java index b09cd81..e5cbfc6 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQuery.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQuery.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElement.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElement.java index 7756d73..0cf4a84 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElement.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElement.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElements.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElements.java index 1dc4332..5f0cfc8 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElements.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NamedQueryElements.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Network.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Network.java index b3dc6a3..daf0bcd 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Network.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Network.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEvent.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEvent.java index e7ed496..d3fac56 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEvent.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEvent.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEventHeader.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEventHeader.java index f53e99d..8d1ff21 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEventHeader.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/NotificationEventHeader.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Notify.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Notify.java index 2ec594c..da1ccb6 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Notify.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Notify.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ObjectFactory.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ObjectFactory.java index 03e914b..37786a7 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ObjectFactory.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ObjectFactory.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterface.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterface.java index 8d9a56c..8052b95 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterface.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterface.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterfaces.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterfaces.java index 5ced877..f1d79a7 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterfaces.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PInterfaces.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLink.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLink.java index 3efde5e..102ccdf 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLink.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLink.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLinks.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLinks.java index d143a1e..32d469e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLinks.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PhysicalLinks.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnf.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnf.java index 8c1d56c..7b6d5f0 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnf.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnf.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnfs.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnfs.java index c93ab83..59001be 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnfs.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pnfs.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Properties.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Properties.java index c801de3..c4bc0b1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Properties.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Properties.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraint.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraint.java index 0845ba2..3cc45e9 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraint.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraint.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraints.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraints.java index 7c6cfb6..52e5e11 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraints.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/PropertyConstraints.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pserver.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pserver.java index e773514..24afe93 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pserver.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pserver.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pservers.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pservers.java index 35a2e4e..93fe9dc 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pservers.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Pservers.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/QueryParameters.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/QueryParameters.java index 39aeade..1126b2e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/QueryParameters.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/QueryParameters.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookup.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookup.java index 3dcdfd0..89874c9 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookup.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookup.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookups.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookups.java index 0d5136b..1b9cc91 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookups.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedLookups.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedToProperty.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedToProperty.java index ac2fade..7bddd00 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedToProperty.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelatedToProperty.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Relationship.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Relationship.java index 3dc1adc..83a2634 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Relationship.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Relationship.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipData.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipData.java index bab44ab..7dd9e79 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipData.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipData.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipList.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipList.java index 85b85a1..704e2d0 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipList.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/RelationshipList.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ReservedPropNames.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ReservedPropNames.java index 0dc2267..31ae96d 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ReservedPropNames.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ReservedPropNames.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResponseList.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResponseList.java index 58cb062..dc9d22a 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResponseList.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResponseList.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResultData.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResultData.java index 1a74e25..619ed94 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResultData.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ResultData.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Search.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Search.java index d5ed925..8b1d3a9 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Search.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Search.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SearchResults.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SearchResults.java index e9d4876..dbaaf93 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SearchResults.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SearchResults.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SecondaryFilter.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SecondaryFilter.java index e59a957..c5096c6 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SecondaryFilter.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SecondaryFilter.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignment.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignment.java index dc3b86a..0221cf2 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignment.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignment.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignments.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignments.java index 6a37818..b5fe544 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignments.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/SegmentationAssignments.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Service.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Service.java index 4eda33e..963e31e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Service.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Service.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceDesignAndCreation.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceDesignAndCreation.java index 27cfe86..e0cd458 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceDesignAndCreation.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceDesignAndCreation.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstance.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstance.java index f422e5d..4b26d84 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstance.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstance.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstances.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstances.java index d4973e6..b6dd552 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstances.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceInstances.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscription.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscription.java index 3aa44f2..c7007da 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscription.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscription.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscriptions.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscriptions.java index 0f6e956..704d546 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscriptions.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/ServiceSubscriptions.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Services.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Services.java index 5966700..f6980bf 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Services.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Services.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshot.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshot.java index 0412b2c..19ac644 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshot.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshot.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshots.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshots.java index bd0e649..cf34d83 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshots.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Snapshots.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/StartNodeFilter.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/StartNodeFilter.java index 885fd7f..5214556 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/StartNodeFilter.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/StartNodeFilter.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnet.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnet.java index 22ecd92..4ed5f06 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnet.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnet.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnets.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnets.java index b4ab743..bbcaeba 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnets.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Subnets.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/TaggedInventoryItemList.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/TaggedInventoryItemList.java index c40f05c..175a9a7 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/TaggedInventoryItemList.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/TaggedInventoryItemList.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenant.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenant.java index 08316e3..fd6933e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenant.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenant.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenants.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenants.java index 9b7d004..744075d 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenants.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Tenants.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Update.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Update.java index 7f298a2..1862b0e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Update.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Update.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/UpdateNodeKey.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/UpdateNodeKey.java index 6916b74..4e6fa18 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/UpdateNodeKey.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/UpdateNodeKey.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModule.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModule.java index 5b92d18..84f7bbc 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModule.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModule.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModules.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModules.java index 309a6b8..c5cab71 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModules.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VfModules.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlan.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlan.java index b5a7a3b..861736e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlan.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlan.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlans.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlans.java index aa30958..e5af2b6 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlans.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vlans.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfc.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfc.java index 124df42..e402509 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfc.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfc.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfcs.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfcs.java index 6f20925..2d929e5 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfcs.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vnfcs.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volume.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volume.java index 38f075c..c716303 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volume.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volume.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroup.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroup.java index 5283f17..3ff2a4c 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroup.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroup.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroups.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroups.java index f064b3c..59fba62 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroups.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/VolumeGroups.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volumes.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volumes.java index 1b2ddec..63497f1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volumes.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Volumes.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vserver.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vserver.java index 0a4b672..1a9aa21 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vserver.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vserver.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vservers.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vservers.java index c0f10e7..3dd45e1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vservers.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/Vservers.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // diff --git a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/package-info.java b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/package-info.java index 43131d0..81ab4da 100644 --- a/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/package-info.java +++ b/aai-service/provider/src/main/java/org/openecomp/aai/inventory/v8/package-info.java @@ -1,8 +1,29 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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========================================================= + */ + // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2017.02.21 at 07:59:51 PM EST +// Generated on: 2017.03.29 at 11:26:46 AM GMT+00:00 // @javax.xml.bind.annotation.XmlSchema(namespace = "http://org.openecomp.aai.inventory/v8", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java index 3217139..a57393c 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIClient.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -109,11 +109,6 @@ public interface AAIClient extends SvcLogicResource, SvcLogicJavaPlugin { public boolean postPhysicalLinkData(String vnf_id, PhysicalLink request) throws AAIServiceException; public boolean deletePhysicalLinkData(String vnf_id, String resourceVersion) throws AAIServiceException; - // PServers - public Pserver requestPServerData(String hostname) throws AAIServiceException; - public boolean postPServerData(String hostname, Pserver server) throws AAIServiceException; - public boolean deletePServerData(String hostname, String resourceVersion) throws AAIServiceException; - // L3Networks public L3Network requestL3NetworkData(String networkId) throws AAIServiceException; public L3Network requestL3NetworkQueryByName(String networkId) throws AAIServiceException; @@ -131,20 +126,15 @@ public interface AAIClient extends SvcLogicResource, SvcLogicJavaPlugin { // Node Query - 1602 public SearchResults requestNodeQuery(String type, String entityIdentifier, String entityName) throws AAIServiceException; public String requestDataByURL(URL url) throws AAIServiceException; -// public Object requestDataInstanceNodeQuery(String type, String vnf_name) throws AAIServiceException; public GenericVnf requestGenericVnfeNodeQuery(String vnf_name) throws AAIServiceException; // // tenant public Tenant requestTenantData(String tenant_id, String cloudOwner, String cloudRegionId) throws AAIServiceException; public Tenant requestTenantDataByName(String tenant_name, String cloudOwner, String cloudRegionId) throws AAIServiceException; public boolean postTenantData(String tenant_id, String cloudOwner, String cloudRegionId, Tenant request) throws AAIServiceException; -// public boolean deleteGenericVnfData(String vnf_id, String resourceVersion) throws AAIServiceException; - - public boolean updateAnAIEntry(Update entity) throws AAIServiceException; public QueryStatus backup(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException; public QueryStatus restore(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException; public void logKeyError(String keys); - ObjectMapper getObjectMapper(); } diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java index b21ad57..f2f83c3 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIDeclarations.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,10 @@ import java.util.regex.Pattern; import javax.xml.bind.annotation.XmlType; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.openecomp.sdnc.sli.SvcLogicContext; import org.openecomp.sdnc.sli.SvcLogicException; import org.openecomp.sdnc.sli.aai.AAIService.AAIRequestExecutor; @@ -52,17 +55,12 @@ import org.openecomp.sdnc.sli.aai.query.InstanceFilters; import org.openecomp.sdnc.sli.aai.query.NamedQuery; import org.openecomp.sdnc.sli.aai.query.NamedQueryData; import org.openecomp.sdnc.sli.aai.query.QueryParameters; -import org.openecomp.sdnc.sli.aai.update.Action; -import org.openecomp.sdnc.sli.aai.update.ActionDatum; -import org.openecomp.sdnc.sli.aai.update.Update; -import org.openecomp.sdnc.sli.aai.update.UpdateNodeKey; -import org.slf4j.Logger; - import com.fasterxml.jackson.databind.ObjectMapper; import org.openecomp.aai.inventory.v8.GenericVnf; import org.openecomp.aai.inventory.v8.InventoryResponseItem; import org.openecomp.aai.inventory.v8.InventoryResponseItems; +import org.openecomp.aai.inventory.v8.L3Network; import org.openecomp.aai.inventory.v8.LogicalLink; import org.openecomp.aai.inventory.v8.Metadata; import org.openecomp.aai.inventory.v8.Metadatum; @@ -72,6 +70,7 @@ import org.openecomp.aai.inventory.v8.RelationshipData; import org.openecomp.aai.inventory.v8.RelationshipList; import org.openecomp.aai.inventory.v8.ResultData; import org.openecomp.aai.inventory.v8.SearchResults; +import org.openecomp.aai.inventory.v8.ServiceInstance; import org.openecomp.aai.inventory.v8.Vlan; import org.openecomp.aai.inventory.v8.Vlans; import org.openecomp.aai.inventory.v8.Vserver; @@ -84,10 +83,11 @@ public abstract class AAIDeclarations implements AAIClient { public static final String KEYSTORE_PATH = "org.openecomp.sdnc.sli.aai.ssl.key"; public static final String KEYSTORE_PSSWD = "org.openecomp.sdnc.sli.aai.ssl.key.psswd"; + public static final String APPLICATION_ID = "org.openecomp.sdnc.sli.aai.application"; + public static final String CLIENT_NAME = "org.openecomp.sdnc.sli.aai.client.name"; public static final String CLIENT_PWWD = "org.openecomp.sdnc.sli.aai.client.psswd"; - public static final String APPLICATION_ID = "org.openecomp.sdnc.sli.aai.application"; public static final String CONNECTION_TIMEOUT = "connection.timeout"; public static final String READ_TIMEOUT = "read.timeout"; @@ -100,49 +100,13 @@ public abstract class AAIDeclarations implements AAIClient { // Update public static final String UPDATE_PATH = "org.openecomp.sdnc.sli.aai.update"; - // VCE - public static final String NETWORK_VCE_PATH = "org.openecomp.sdnc.sli.aai.path.vce"; - - // VPE - public static final String NETWORK_VPE_PATH = "org.openecomp.sdnc.sli.aai.path.vpe"; - - // VPLS-PE - public static final String NETWORK_VPLS_PE_PATH = "org.openecomp.sdnc.sli.aai.path.vpls.pe"; - // Service instance public static final String SVC_INSTANCE_PATH = "org.openecomp.sdnc.sli.aai.path.svcinst"; public static final String SVC_INST_QRY_PATH = "org.openecomp.sdnc.sli.aai.path.svcinst.query"; - // customer - public static final String CUSTOMER_PATH = "org.openecomp.sdnc.sli.aai.path.customer"; - - // Complexes - public static final String NETWORK_COMPLEX_PATH = "org.openecomp.sdnc.sli.aai.path.complex"; - - // PServer - public static final String NETWORK_PSERVER_PATH = "org.openecomp.sdnc.sli.aai.path.pserver"; - // VServer public static final String NETWORK_VSERVER_PATH = "org.openecomp.sdnc.sli.aai.path.vserver"; - // DVS Seitch - public static final String NETWORK_DVSSWITCH_PATH = "org.openecomp.sdnc.sli.aai.path.dvsswitch"; - - // GENERIC VNF - public static final String GENERIC_VNF_PATH = "org.openecomp.sdnc.sli.aai.path.generic.vnf"; - - // CTAG Pool - public static final String CTAG_POOLS_PATH = "org.openecomp.sdnc.sli.aai.path.ctag.pools"; - public static final String CTAG_POOL_PATH = "org.openecomp.sdnc.sli.aai.path.ctag.pool"; - - // L3 Network - public static final String L3_NETWORK_PATH = "org.openecomp.sdnc.sli.aai.path.l3network"; - public static final String L3_NETWORK_PATH_QUERY_NAME = "org.openecomp.sdnc.sli.aai.path.l3network.query.name"; - - // VPN Bindings - public static final String VPN_BINDING_PATH = "org.openecomp.sdnc.sli.aai.path.vpn.binding"; - - public static final String VNF_IMAGE_PATH = "org.openecomp.sdnc.sli.aai.path.vnf.image"; public static final String VNF_IMAGE_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.vnf.image.query"; public static final String QUERY_FORMAT = "org.openecomp.sdnc.sli.aai.param.format"; @@ -162,9 +126,6 @@ public abstract class AAIDeclarations implements AAIClient { // P-Interfaces public static final String P_INTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.pserver.pinterface"; - // Physical Link - public static final String PHYSICAL_LINK_PATH = "org.openecomp.sdnc.sli.aai.path.physical.link"; - // site-pair-sets public static final String SITE_PAIR_SET_PATH = "org.openecomp.sdnc.sli.aai.path.site.pair.set"; @@ -187,15 +148,25 @@ public abstract class AAIDeclarations implements AAIClient { HashMap<String, String> nameValues = keyToHashMap(key, ctx); getLogger().debug("key = "+ nameValues.toString()); + if(!checkOldFormat(resource, nameValues)) { + ctx.setAttribute(String.format("%s.error.message", prefix), String.format("Resource %s is not supported. Key string contains invaid identifiers", resource)); + return QueryStatus.FAILURE; + } + + if(resource == null || resource.isEmpty() || AAIRequest.createRequest(resource, nameValues) == null) { + ctx.setAttribute(String.format("%s.error.message", prefix), String.format("Resource %s is not supported", resource)); + return QueryStatus.FAILURE; + } + // process data using new model boolean useNewModelProcessing = true; // process server query by name the old way if(("vserver".equals(resource) || "vserver2".equals(resource))){ - if(nameValues.containsKey("vserver_name") || nameValues.containsKey("vserver-name")) + if(nameValues.containsKey("vserver_name") || nameValues.containsKey("vserver-name") || nameValues.containsKey("vserver.vserver_name") || nameValues.containsKey("vserver.vserver-name")) useNewModelProcessing = false; } if("generic-vnf".equals(resource)){ - if(nameValues.containsKey("vnf_name") || nameValues.containsKey("vnf-name")) + if(nameValues.containsKey("vnf_name") || nameValues.containsKey("vnf-name") || nameValues.containsKey("generic_vnf.vnf_name") || nameValues.containsKey("generic-vnf.vnf-name")) useNewModelProcessing = false; } @@ -210,7 +181,7 @@ public abstract class AAIDeclarations implements AAIClient { } } - ObjectMapper mapper = getObjectMapper(); + ObjectMapper mapper = AAIService.getObjectMapper(); Map<String,Object> attributes = new HashMap<String,Object>(); String modifier = null; @@ -230,7 +201,16 @@ public abstract class AAIDeclarations implements AAIClient { switch(resource) { case "generic_vnf": vnfId = nameValues.get("vnf_id"); - vnfName = nameValues.get("vnf_name"); + if(nameValues.containsKey("vnf_id")) + vnfId = nameValues.get("vnf_id"); + else if(nameValues.containsKey("generic_vnf.vnf_name")) + vnfId = nameValues.get("generic_vnf.vserver_name"); + + if(nameValues.containsKey("vnf_name")) + vnfName = nameValues.get("vnf_name"); + else if(nameValues.containsKey("generic_vnf.vnf_name")) + vnfName = nameValues.get("generic_vnf.vnf_name"); + if(vnfId != null && !vnfId.isEmpty()) { // at this point of the project this part should not be executed vnfId = vnfId.trim().replace("'", "").replace("$", "").replace("'", ""); @@ -273,45 +253,78 @@ public abstract class AAIDeclarations implements AAIClient { break; case "vserver": case "vserver2": - String vserverName = nameValues.get("vserver_name"); - String vserverId = nameValues.get("vserver_id"); + String vserverName = null; + if(nameValues.containsKey("vserver_name")) + vserverName = nameValues.get("vserver_name"); + else if(nameValues.containsKey("vserver.vserver_name")) + vserverName = nameValues.get("vserver.vserver_name"); + + String vserverId = null; + if(nameValues.containsKey("vserver_id")) + vserverId = nameValues.get("vserver_id"); + if(nameValues.containsKey("vserver.vserver_id")) + vserverId = nameValues.get("vserver.vserver_id"); String tenantId = nameValues.get("teannt_id"); if(vserverName != null) vserverName = vserverName.trim().replace("'", "").replace("$", "").replace("'", ""); if(vserverId != null) vserverId = vserverId.trim().replace("'", "").replace("$", "").replace("'", ""); if(tenantId != null) tenantId = tenantId.trim().replace("'", "").replace("$", "").replace("'", ""); - if(vserverName != null) { - try { -// add cloud region to return data - URL vserverUrl = this.requestVserverURLNodeQuery(vserverName); - if(vserverUrl == null) { - return QueryStatus.NOT_FOUND; - } + if (vserverName != null) { + URL vserverUrl = null; + try { + vserverUrl = this.requestVserverURLNodeQuery(vserverName); + } catch (AAIServiceException aaiexc) { + ctx.setAttribute(prefix + ".error.message", aaiexc.getMessage()); + if (aaiexc.getReturnCode() >= 300) { + ctx.setAttribute(prefix + ".error.http.response-code", "" + aaiexc.getReturnCode()); + } - tenantId = getTenantIdFromVserverUrl(vserverUrl); - String cloudOwner = getCloudOwnerFromVserverUrl(vserverUrl); - String cloudRegionId = getCloudRegionFromVserverUrl(vserverUrl); + if (aaiexc.getReturnCode() == 404) + return QueryStatus.NOT_FOUND; + else + return QueryStatus.FAILURE; + } + if (vserverUrl == null) { + return QueryStatus.NOT_FOUND; + } - Vserver vserver = this.requestVServerDataByURL(vserverUrl); - if(vserver == null) { - return QueryStatus.NOT_FOUND; - } - attributes = mapper.convertValue(vserver, attributes.getClass()); - if(!attributes.containsKey("tenant-id") && tenantId != null){ - attributes.put("tenant-id", tenantId); - } - if(!attributes.containsKey("cloud-owner") && cloudOwner != null){ - attributes.put("cloud-owner", cloudOwner); - } - if(!attributes.containsKey("cloud-region-id") && cloudRegionId != null){ - attributes.put("cloud-region-id", cloudRegionId); - } - } catch (AAIServiceException e) { - getLogger().warn("Caught exception trying to refresh generic VNF", e); + tenantId = getTenantIdFromVserverUrl(vserverUrl); + String cloudOwner = nameValues.get("cloud_region.cloud_owner"); + String cloudRegionId = nameValues.get("cloud_region.cloud_region_id"); + + Vserver vserver = null; + try { + vserver = this.requestVServerDataByURL(vserverUrl); + } catch (AAIServiceException aaiexc) { + ctx.setAttribute(prefix + ".error.message", aaiexc.getMessage()); + if (aaiexc.getReturnCode() >= 300) { + ctx.setAttribute(prefix + ".error.http.response-code", "" + aaiexc.getReturnCode()); } - } else if(vserverId != null && tenantId != null) { - Vserver vserver = this.requestVServerData(tenantId, vserverId, "att-aic", "AAIAIC25"); + + if (aaiexc.getReturnCode() == 404) + return QueryStatus.NOT_FOUND; + else + return QueryStatus.FAILURE; + } + if (vserver == null) { + return QueryStatus.NOT_FOUND; + } + attributes = mapper.convertValue(vserver, attributes.getClass()); + if (!attributes.containsKey("tenant-id") && tenantId != null) { + attributes.put("tenant-id", tenantId); + } + if (!attributes.containsKey("cloud-owner") && cloudOwner != null) { + attributes.put("cloud-owner", cloudOwner); + } + if (!attributes.containsKey("cloud-region-id") && cloudRegionId != null) { + attributes.put("cloud-region-id", cloudRegionId); + } + } else if (vserverId != null && tenantId != null) { + String cloudOwner = nameValues.get("cloud_region.cloud_owner"); + String cloudRegionId = nameValues.get("cloud_region.cloud_region_id"); + + Vserver vserver = this.requestVServerData(tenantId, vserverId, cloudOwner, cloudRegionId); if(vserver == null) { return QueryStatus.NOT_FOUND; } @@ -379,6 +392,37 @@ public abstract class AAIDeclarations implements AAIClient { // return QueryStatus.SUCCESS; } + private boolean checkOldFormat(String resource, HashMap<String, String> nameValues) { + + switch(resource){ + case "generic-query": + case "named-query": + case "nodes-query": + case "linterface": + case "l2-bridge-sbg": + case "l2-bridge-bgf": + case "echo": + case "test": + return true; + } + if(resource.contains(":")) { + resource = resource.substring(0, resource.indexOf(":")); + } + + Set<String> keys = nameValues.keySet(); + for(String key : keys) { + if(!key.contains(".")) { + if("depth".equals(key) || "related-to".equals(key) || "related_to".equals(key)) + continue; + else { + getLogger().warn(String.format("key %s is incompatible with resource type '%s'", key, resource)); + return false; + } + } + } + return true; + } + public void writeMap(Map<String, Object> properties, String prefix, SvcLogicContext ctx) { Set<String> mapKeys = properties.keySet(); @@ -424,13 +468,19 @@ public abstract class AAIDeclarations implements AAIClient { throws SvcLogicException { getLogger().debug("AAIService.save\tresource="+resource); + HashMap<String, String> nameValues = keyToHashMap(key, ctx); + + if(!checkOldFormat(resource, nameValues)) { + ctx.setAttribute(String.format("%s.error.message", prefix), String.format("Resource %s is not supported. Key string contains invaid identifiers", resource)); + return QueryStatus.FAILURE; + } - if(resource == null || resource.isEmpty()) { + if(resource == null || resource.isEmpty() || AAIRequest.createRequest(resource, nameValues) == null) { getLogger().warn("AAIService.save has unspecified resource"); + ctx.setAttribute(String.format("%s.error.message", prefix), String.format("Resource %s is not supported", resource)); return QueryStatus.FAILURE; } // keys passed - HashMap<String, String> nameValues = keyToHashMap(key, ctx); getLogger().debug("key = "+ Arrays.toString(nameValues.entrySet().toArray())); // process params @@ -444,7 +494,6 @@ public abstract class AAIDeclarations implements AAIClient { // params passed getLogger().debug("parms = "+ Arrays.toString(params.entrySet().toArray())); - boolean useNewModelProcessing = true; // process server query by name the old way if(("vserver".equals(resource) || "vserver2".equals(resource))){ @@ -461,6 +510,7 @@ public abstract class AAIDeclarations implements AAIClient { path = request.getRequestUrl("GET", null); params.put("vserver-selflink", path.toString()); } catch (UnsupportedEncodingException | MalformedURLException e) { + // TODO : Fix this params.put("vserver-selflink", "/vserver"); } } @@ -476,7 +526,7 @@ public abstract class AAIDeclarations implements AAIClient { String[] tokens = resource.split(":"); String localResource = tokens[0]; String dependency = tokens[1]; - // get the object + AAIDatum instance = newModelObjectRequest( localResource, nameValues, prefix, ctx); if(instance == null) { return QueryStatus.NOT_FOUND; @@ -558,83 +608,53 @@ public abstract class AAIDeclarations implements AAIClient { } @Override - public QueryStatus update(String resource, String key, Map<String, String> parms, String prefix, SvcLogicContext ctx) throws SvcLogicException { + public QueryStatus update(String resource, String key, Map<String, String> params, String prefix, SvcLogicContext ctx) throws SvcLogicException { resource = resource.toLowerCase(); HashMap<String, String> nameValues = keyToHashMap(key, ctx); getLogger().debug("key = "+ Arrays.toString(nameValues.entrySet().toArray())); - getLogger().debug("parms = "+ Arrays.toString(parms.entrySet().toArray())); - - AAIRequest request = AAIRequest.createRequest(resource, nameValues); - if(request == null) { - if("generic-vnf".equals(resource)) { - request = new GenericVnfRequest(); - } + if(!checkOldFormat(resource, nameValues)) { + ctx.setAttribute(String.format("%s.error.message", prefix), String.format("Resource %s is not supported. Key string contains invaid identifiers", resource)); + return QueryStatus.FAILURE; } - String resourceType = resource; - if(request != null) { - resourceType = request.getPrimaryResourceName(resource); + if(resource == null || resource.isEmpty() || AAIRequest.createRequest(resource, nameValues) == null) { + ctx.setAttribute(String.format("%s.error.message", prefix), String.format("Resource %s is not supported", resource)); + return QueryStatus.FAILURE; } - try { - Update update = new Update(); - update.setUpdateNodeType(resourceType); - - List<UpdateNodeKey> updateNodeKeyList = update.getUpdateNodeKey(); - if(updateNodeKeyList == null) { - updateNodeKeyList = new ArrayList<UpdateNodeKey>(); - } - - Set<String>keys = nameValues.keySet(); - - for(String argument: keys) { - if(nameValues.containsKey(argument)){ - String value = nameValues.get(argument); - if(value != null && !value.isEmpty()) { - argument = argument.replaceAll("_", "-"); - value = value.trim().replaceAll("'", "").replace("$", "").replace("'", ""); - // set node key - UpdateNodeKey updateNodeKey = new UpdateNodeKey(); - if(request != null) - updateNodeKey.setKeyName( request.formatKey(argument)); - else - updateNodeKey.setKeyName(argument); - updateNodeKey.setKeyValue(value); - - updateNodeKeyList.add(updateNodeKey); - } - } - } - + getLogger().debug("parms = "+ Arrays.toString(params.entrySet().toArray())); - // set actions - List<Action> actionList = update.getAction(); - if(actionList == null) { - actionList = new ArrayList<Action>(); - } - Action action = new Action(); - action.setActionType("replace"); + AAIRequest request = AAIRequest.createRequest(resource, nameValues); + request = new UpdateRequest(request, params); - List<ActionDatum> actionData = action.getActionData(); - if(actionData == null) { - actionData = new ArrayList<ActionDatum>(); + String[] arguments = request.getArgsList(); + for(String name : arguments) { + String modifiedKey = name.replaceAll("-", "_"); + if(nameValues.containsKey(modifiedKey)) { + String argValue = nameValues.get(modifiedKey); + if(argValue != null) argValue = argValue.trim().replace("'", "").replace("$", "").replace("'", ""); + request.addRequestProperty(name, argValue); } + } - keys = parms.keySet(); + try { + QueryStatus retval = QueryStatus.SUCCESS; - for(String name : keys) { - ActionDatum actionDatum = new ActionDatum(); - actionDatum.setPropertyName(name); - String value = parms.get(name); - actionDatum.setPropertyValue(value); + retval = newModelQuery(resource, false, null, key, "tmpDelete", null, ctx); - actionData.add(actionDatum); + if(retval == null || retval != QueryStatus.SUCCESS) { + return retval; } - actionList.add(action); + String resourceVersion = ctx.getAttribute("tmpDelete.resource-version"); + if(resourceVersion == null) { + return QueryStatus.NOT_FOUND; + } + params.put("resource-version", resourceVersion); - this.updateAnAIEntry(update); + request.processRequestPathValues(nameValues); + getExecutor().patch(request, resourceVersion); } catch(AAIServiceException aaiexc) { if(aaiexc.getReturnCode() == 404) return QueryStatus.NOT_FOUND; @@ -651,9 +671,20 @@ public abstract class AAIDeclarations implements AAIClient { @Override public QueryStatus delete(String resource, String key, SvcLogicContext ctx) throws SvcLogicException { + getLogger().debug("AAIService.delete\tresource="+resource); HashMap<String, String> nameValues = keyToHashMap(key, ctx); getLogger().debug("key = "+ Arrays.toString(nameValues.entrySet().toArray())); + if(!checkOldFormat(resource, nameValues)) { + ctx.setAttribute(String.format("%s.error.message", "aaiData"), String.format("Resource %s is not supported. Key string contains invaid identifiers", resource)); + return QueryStatus.FAILURE; + } + + if(resource == null || resource.isEmpty() || AAIRequest.createRequest(resource, nameValues) == null) { + ctx.setAttribute(String.format("%s.error.message", "tmpDelete"), String.format("Resource %s is not supported", resource)); + return QueryStatus.FAILURE; + } + if(AAIRequest.createRequest(resource, nameValues) != null) { if(resource.contains(":")) { return processDeleteRelationshipList(resource, key, ctx, nameValues); @@ -745,6 +776,16 @@ public abstract class AAIDeclarations implements AAIClient { if(!itemRemoved) return QueryStatus.NOT_FOUND; +// AAIRequest masterRequest = new GenericVnfRequest(); +// masterRequest.addRequestProperty(GenericVnfRequest.VNF_ID, vnfId); +// relationshipRequest.addMasterRequest(masterRequest); +// Map<String, String> attributes = objectToProperties(vnf); +// try { +// Boolean result = getExecutor().delete(relationshipRequest, attributes.get(AAIRequest.RESOURCE_VERSION)); +// } catch (AAIServiceException e) { +// return QueryStatus.FAILURE; +// } + try { this.postGenericVnfData(vnf.getVnfId(), vnf); } catch (AAIServiceException exc) { @@ -799,6 +840,7 @@ public abstract class AAIDeclarations implements AAIClient { } Map<String, String> params = new HashMap<String, String>(); + request.processRequestPathValues(nameValues); if(nameValues.containsKey("prefix")){ Map<String, String> tmpParams = ctxGetBeginsWith(ctx, nameValues.get("prefix")); @@ -845,12 +887,6 @@ public abstract class AAIDeclarations implements AAIClient { if(iRIlist == null || iRIlist.isEmpty()) { return QueryStatus.NOT_FOUND; } - - ObjectMapper mapper = getObjectMapper(); - Map<String, Object> subnetsList = mapper.convertValue(rd, Map.class); - writeMap(subnetsList, prefix, ctx); - return QueryStatus.SUCCESS; -// writeList((ArrayList)iRIlist, String.format("%s.%s", prefix, "inventory-response-items"), ctx); } if("nodes-query".equals(resource)) { @@ -899,9 +935,10 @@ public abstract class AAIDeclarations implements AAIClient { } if(value instanceof ArrayList) { - ArrayList array = ArrayList.class.cast(value); + ArrayList<?> array = ArrayList.class.cast(value); for(int i = 0; i < array.size(); i++) { - ctx.setAttribute(String.format("%s%s[%d]", preFix, theKey, i), array.get(i).toString()); +// ctx.setAttribute(String.format("%s%s[%d]", preFix, theKey, i), array.get(i).toString()); + writeList(array, String.format("%s.%s", prefix, theKey), ctx); } continue; } @@ -1026,15 +1063,8 @@ public abstract class AAIDeclarations implements AAIClient { if(request == null) { return null; } - String[] arguments = request.getArgsList(); - for(String name : arguments) { - String tmpName = name.replaceAll("-", "_"); - String value = params.get(tmpName); - if(value != null && !value.isEmpty()) { - value = value.trim().replace("'", "").replace("$", "").replace("'", ""); - request.addRequestProperty(name, value); - } - } + + request.processRequestPathValues(params); String rv = getExecutor().get(request); response = request.jsonStringToObject(rv); } catch(AAIServiceException aaiexc) { @@ -1095,7 +1125,7 @@ public abstract class AAIDeclarations implements AAIClient { Method setter = null; try { setter = resourceClass.getMethod("set"+StringUtils.capitalize(value), type); - if(type.getName().startsWith("java.lang")) { + if(type.getName().startsWith("java.lang") || "boolean".equals(type.getName()) || "long".equals(type.getName())) { try { setter.setAccessible(true); Object arglist[] = new Object[1]; @@ -1104,7 +1134,13 @@ public abstract class AAIDeclarations implements AAIClient { if(arglist[0] != null) { if(!type.getName().equals("java.lang.String")) { // getLogger().debug(String.format("Processing %s with parameter %s", types[0].getName(), value)); - arglist[0] = valueOf(type, parms.get(id)); + if("boolean".equals(type.getName())) { + arglist[0] = valueOf(Boolean.class, parms.get(id)); + } else if("long".equals(type.getName())) { + arglist[0] = valueOf(Long.class, parms.get(id)); + } else { + arglist[0] = valueOf(type, parms.get(id)); + } } Object o = setter.invoke(instance, arglist); } @@ -1377,9 +1413,6 @@ public abstract class AAIDeclarations implements AAIClient { // 6. Prepare AAI request -// HashMap<String, String> nameValues = keyToHashMap(key, ctx); - Set<String> keys = nameValues.keySet(); - for(String haslo : keys) { getLogger().debug("Key = " + haslo + "\tValue = ->" + nameValues.get(haslo) + "<-"); } String[] args = request.getArgsList(); for(String arg : args) { String modifiedKey = arg.replaceAll("-", "_"); @@ -1389,6 +1422,8 @@ public abstract class AAIDeclarations implements AAIClient { request.addRequestProperty(arg, argValue); } } + + request.processRequestPathValues(nameValues); request.setRequestObject(instance); getExecutor().post(request); @@ -1488,34 +1523,35 @@ public abstract class AAIDeclarations implements AAIClient { j = 0; String relatedTo = params.get(searchKey); + String relatedLinkKey = "relationship-list.relationship[" + i + "].related-link"; + String relatedLink = null; + if(params.containsKey(relatedLinkKey)) { + relatedLink = params.get(relatedLinkKey); + } - Relationship relationship = null; //findRelationship(relationships, relatedTo); - if(relationship == null) { - relationship = new Relationship(); + Relationship relationship = new Relationship(); relationships.add(relationship); relationship.setRelatedTo(relatedTo); - } - - - List<RelationshipData> relData = relationship.getRelationshipData(); -// if(relData == null) { -// relData = new LinkedList<RelationshipDatum>(); -// relationship.setRelationshipData(relData); -// } + if(relatedLink != null) { + relationship.setRelatedLink(relatedLink); + } else { + List<RelationshipData> relData = relationship.getRelationshipData(); - while(true) { - String searchRelationshipKey = "relationship-list.relationship[" + i + "].relationship-data[" + j + "].relationship-key"; - String searchRelationshipValue = "relationship-list.relationship[" + i + "].relationship-data[" + j + "].relationship-value"; - if(!params.containsKey(searchRelationshipKey)) - break; + while(true) { + String searchRelationshipKey = "relationship-list.relationship[" + i + "].relationship-data[" + j + "].relationship-key"; + String searchRelationshipValue = "relationship-list.relationship[" + i + "].relationship-data[" + j + "].relationship-value"; + if(!params.containsKey(searchRelationshipKey)) + break; - RelationshipData relDatum = new RelationshipData(); - relDatum.setRelationshipKey(params.get(searchRelationshipKey)); - relDatum.setRelationshipValue(params.get(searchRelationshipValue)); - relData.add(relDatum); - j++; + RelationshipData relDatum = new RelationshipData(); + relDatum.setRelationshipKey(params.get(searchRelationshipKey)); + relDatum.setRelationshipValue(params.get(searchRelationshipValue)); + relData.add(relDatum); + j++; + } } + i++; } } @@ -1688,8 +1724,8 @@ public abstract class AAIDeclarations implements AAIClient { return QueryStatus.NOT_FOUND; } - private Map<String, Object> objectToProperties(Object object) { - ObjectMapper mapper = getObjectMapper(); + protected Map<String, Object> objectToProperties(Object object) { + ObjectMapper mapper = AAIService.getObjectMapper(); return mapper.convertValue(object, Map.class); } @@ -1697,12 +1733,10 @@ public abstract class AAIDeclarations implements AAIClient { Exception cause = null; T ret = null; try { - ret = klazz.cast( - klazz.getDeclaredMethod("valueOf", String.class) - .invoke(null, arg) - ); - } catch (NoSuchMethodException e) { - cause = e; + ret = klazz.cast(klazz.getDeclaredMethod("valueOf", String.class).invoke(null, arg)); + } catch (NoSuchMethodException exc) { + LoggerFactory.getLogger(AAIService.class).warn("Wrong data type", exc); + ret = klazz.cast(arg); } catch (IllegalAccessException e) { cause = e; } catch (InvocationTargetException e) { @@ -1727,6 +1761,8 @@ public abstract class AAIDeclarations implements AAIClient { Class resourceClass = request.getModelClass(); Object instance = getResource(url.toString(), resourceClass); + if(instance == null) + return QueryStatus.NOT_FOUND; // get resource version String resourceVersion = null; @@ -1770,14 +1806,19 @@ public abstract class AAIDeclarations implements AAIClient { relatedTo = relatedTo.replaceAll("_", "-"); + String relatedLink = nameValues.get("relationship.related_link"); + List<Relationship> relationships = relationshipList.getRelationship(); List<Relationship> relationshipsToDelete = new LinkedList<Relationship>(); for(Relationship relationship : relationships) { - getLogger().debug(String.format("Comparing existing relationship of '%s' to keyword '%s'", relationship.getRelatedTo(), relatedTo)); if(relatedTo.equals(relationship.getRelatedTo())) { - getLogger().debug("Found relationship"); -// targetRelationship = relationship; + if(relatedLink != null) { + if(relationship.getRelatedLink() == null || !relationship.getRelatedLink().endsWith(relatedLink)) { + continue; + } + } + getLogger().debug(String.format("Found relationship of '%s' to keyword '%s'", relationship.getRelatedTo(), relatedTo)); relationshipsToDelete.add(relationship); } } @@ -1790,7 +1831,7 @@ public abstract class AAIDeclarations implements AAIClient { path = path + "/relationship-list/relationship"; URL deleteUrl = new URL(path); - ObjectMapper mapper = getObjectMapper(); + ObjectMapper mapper = AAIService.getObjectMapper(); boolean cumulativeResponse = true; @@ -1813,7 +1854,7 @@ public abstract class AAIDeclarations implements AAIClient { } } - public static final Map<String, String> ctxGetBeginsWith( SvcLogicContext ctx, String prefix ) { + static final Map<String, String> ctxGetBeginsWith( SvcLogicContext ctx, String prefix ) { Map<String, String> tmpPrefixMap = new HashMap<String, String>(); if(prefix == null || prefix.isEmpty()){ @@ -1862,7 +1903,7 @@ public abstract class AAIDeclarations implements AAIClient { /** */ - private NamedQueryData extractNamedQueryDataFromQueryPrefix(HashMap<String, String> nameValues, Map<String, String> parms) { + protected NamedQueryData extractNamedQueryDataFromQueryPrefix(HashMap<String, String> nameValues, Map<String, String> parms) { if(parms.isEmpty()) { return null; } @@ -1932,6 +1973,24 @@ public abstract class AAIDeclarations implements AAIClient { InstanceFilter insf = new InstanceFilter(); insf.setPnf(pnf); data.getInstanceFilters().getInstanceFilter().add(insf); + +// } else if("service-instance".equals(split[0])) { +// ServiceInstance serviceInstance = new ServiceInstance(); +// serviceInstance.setServiceInstanceId(value); +// +// InstanceFilter insf = new InstanceFilter(); +// insf.setServiceInstance(serviceInstance); +// data.getInstanceFilters().getInstanceFilter().add(insf); + +// } else if("l3-network".equals(split[0])) { +// L3Network l3Network = new L3Network(); +// if("network-role".equals(split[1])) { +// l3Network.setNetworkRole(value); +// } +// +// InstanceFilter insf = new InstanceFilter(); +// insf.setL3Network(l3Network); +// data.getInstanceFilters().getInstanceFilter().add(insf); } } } diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIExecutorInterface.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIExecutorInterface.java index e549a50..3a8b046 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIExecutorInterface.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIExecutorInterface.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,9 @@ package org.openecomp.sdnc.sli.aai; public interface AAIExecutorInterface { - Object get(AAIRequest request) throws AAIServiceException; - Object post(AAIRequest request) throws AAIServiceException; - Boolean delete(AAIRequest request, String resourceVersion) throws AAIServiceException; - Object query(AAIRequest request, Class clas) throws AAIServiceException; + public Object get(AAIRequest request) throws AAIServiceException; + public Object post(AAIRequest request) throws AAIServiceException; + public Boolean delete(AAIRequest request, String resourceVersion) throws AAIServiceException; + public Object query(AAIRequest request, Class clas) throws AAIServiceException; + public Boolean patch(AAIRequest request, String resourceVersion) throws AAIServiceException; } diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java index dc4b8fc..30d2168 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,26 +22,40 @@ package org.openecomp.sdnc.sli.aai; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import java.io.UnsupportedEncodingException; +import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; +import java.net.URLDecoder; import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; +import java.util.TreeSet; -import org.openecomp.sdnc.sli.aai.data.AAIDatum; +import org.apache.commons.lang.StringUtils; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.openecomp.sdnc.sli.aai.data.AAIDatum; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.AnnotationIntrospector; -import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.type.TypeFactory; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; + +import org.openecomp.aai.inventory.v8.GenericVnf; public abstract class AAIRequest { protected static final Logger LOG = LoggerFactory.getLogger(AAIRequest.class); @@ -52,6 +66,8 @@ public abstract class AAIRequest { public static final String RESOURCE_VERSION = "resource-version"; + public static final String DEPTH = "depth"; + protected static Properties configProperties; protected final String target_uri; protected static AAIService aaiService; @@ -76,107 +92,120 @@ public abstract class AAIRequest { } if(nameValues.containsKey("selflink")){ - AAIRequest localRequest = createRequest(resoource, new HashMap<String, String>()); - if(localRequest != null) - return new SelfLinkRequest(localRequest.getModelClass()); + Class<? extends AAIDatum> clazz = null; + try { + clazz = getClassFromResource(resoource) ; + } catch (ClassNotFoundException e) { + LOG.warn("AAIRequest does not support class: " + e.getMessage()); + return null; + } + + if(clazz != null) + return new SelfLinkRequest(clazz); else return null; } switch(resoource){ - case "cloud-region": - return new CloudRegionRequest(); - case "customer": - return new CustomerRequest(); case "generic-query": return new GenericQueryRequest(); - case "generic-vnf": - return new GenericVnfRequest(); - case "logical-link": - return new LogicalLinkRequest(); - case "l-interface": - if(nameValues.containsKey("generic_vnf.vnf_id") || nameValues.containsKey("vnf_id")) { - return new GenericVnfLInterfaceRequest(); - } + case "named-query": + return new NamedQueryRequest(); + case "nodes-query": + return new NodesQueryRequest(); case "linterface": return new LInterfaceRequest(LInterfaceRequest.TYPE.L2_BRIDGE_SBG); case "l2-bridge-sbg": return new SubInterfaceRequest(SubInterfaceRequest.TYPE.L2_BRIDGE_SBG); case "l2-bridge-bgf": return new SubInterfaceRequest(SubInterfaceRequest.TYPE.L2_BRIDGE_BGF); - case "l3-interface-ipv4-address-list": - return new L3InterfaceIpv4AddressListRequest(); - case "l3-interface-ipv6-address-list": - return new L3InterfaceIpv6AddressListRequest(); - case "l3-network": - return new L3NetworkRequest(); - case "l3-network-subnet": - case "subnet": - return new SubnetRequest(); - case "lag-interface": - return new LagInterfacePnfRequest(); - case "named-query": - return new NamedQueryRequest(); - case "nodes-query": - return new NodesQueryRequest(); - case "p-interface": - if(nameValues.containsKey(PInterfaceRequest.HOSTNAME) || nameValues.containsKey(PInterfaceRequest.PSERVER_HOSTNAME)){ - return new PInterfaceRequest(); - } - if(nameValues.containsKey(PnfRequest.PNF_NAME.replaceAll("-", "_")) || nameValues.containsKey(PnfRequest.PNF_PNF_NAME.replaceAll("-", "_"))){ - return new PInterfacePnfRequest(); - } - return null; - case "physical-link": - return new PhysicalLinkRequest(); - case "pnf": - return new PnfRequest(); - case "pserver": - return new PServerRequest(); - case "service": - return new ServiceRequest(); - case "service-instance": - return new ServiceInstanceRequest(); - case "service-subscription": - return new ServiceSubscriptionRequest(); - case "tenant": - return new TenantRequest(); - case "vnfc": - return new VnfcRequest(); - case "vserver": - case "vserver2": - return new VserverRequest(); - case "vf-module": - return new VfModuleRequest(); - case "vlan": - if(nameValues.containsKey(GenVnfrVLanRequest.VNF_ID)) - return new GenVnfrVLanRequest(); - else if(nameValues.containsKey(VServerVLanRequest.VSERVER_ID)) - return new VServerVLanRequest(); - else { - LOG.warn("VLAN request is not supported based on the key structure " + nameValues.keySet().toString()); - return new VLanRequest(); - } - case "volume-group": - return new VolumeGroupRequest(); case "echo": case "test": return new EchoRequest(); + default: - return null; + { + AAIRequest request = getRequestFromResource(resoource); + if(request == null) { + return null; + } + return request; + } } } + + /** + * Map containing resource tag to its bit position in bitset mapping + */ + private static Map<String, String> tagValues = new LinkedHashMap<String, String>(); + /** + * Map containing bitset value of the path to its path mapping + */ + private static Map<BitSet, String> bitsetPaths = new LinkedHashMap<BitSet, String>(); + + public static void setProperties(Properties props, AAIService aaiService) { AAIRequest.configProperties = props; AAIRequest.aaiService = aaiService; + + try + { + URL url = null; + Bundle bundle = FrameworkUtil.getBundle(AAIServiceActivator.class); + if(bundle != null) { + BundleContext ctx = bundle.getBundleContext(); + if(ctx == null) + return; + + url = ctx.getBundle().getResource(AAIService.PATH_PROPERTIES); + } else { + url = aaiService.getClass().getResource("/aai-path.properties"); + } + + InputStream in = url.openStream(); + Reader reader = new InputStreamReader(in, "UTF-8"); + + Properties properties = new Properties(); + properties.load(reader); + LOG.info("loaded " + properties.size()); + + Set<String> keys = properties.stringPropertyNames(); + + int index = 0; + Set<String> resourceNames = new TreeSet<String>(); + + for(String key : keys) { + String[] tags = key.split("\\|"); + for(String tag : tags) { + if(!resourceNames.contains(tag)) { + resourceNames.add(tag); + tagValues.put(tag, Integer.toString(++index)); + } + } + BitSet bs = new BitSet(256); + for(String tag : tags) { + String value = tagValues.get(tag); + Integer bitIndex = Integer.parseInt(value) ; + bs.set(bitIndex); + } + String path = properties.getProperty(key); + LOG.info(String.format("bitset %s\t\t%s", bs.toString(), path)); + bitsetPaths.put(bs, path); + } + LOG.info("loaded " + resourceNames.toString()); + } + catch (Exception e) + { + LOG.error("Caught exception", e); + } } public AAIRequest() { target_uri = configProperties.getProperty(TARGET_URI); } - public final void addRequestProperty(String key, String value) { + public void addRequestProperty(String key, String value) { requestProperties.put(key, value); } @@ -200,7 +229,61 @@ public abstract class AAIRequest { aaiService.getLogger().warn("Could not deserialize object of type " + lInterfaceRequest.getClass().getSimpleName(), exc) ; } - public abstract URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException; +// public abstract URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException; + + public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { + + String request_url = null; + + request_url = target_uri + getRequestPath(); + + Set<String> uniqueResources = extractUniqueResourceSetFromKeys(requestProperties.stringPropertyNames()); + +// request_url = processPathData(request_url, requestProperties); + + for(String resoourceName:uniqueResources) { + AAIRequest locRequest = AAIRequest.createRequest(resoourceName, new HashMap<String, String>()); + if(locRequest != null) { + Class<?> clazz = locRequest.getClass(); + Method function = null; + try { + function = clazz.getMethod("processPathData", request_url.getClass(), requestProperties.getClass()); + request_url = (String) function.invoke(null, request_url, requestProperties); + } catch (Exception e) { + e.printStackTrace(); + } +// request_url = locRequest.processPathData(request_url, requestProperties); + } + } + + if(resourceVersion != null) { + request_url = request_url +"?resource-version="+resourceVersion; + } + URL http_req_url = new URL(request_url); + + aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); + + + return http_req_url; + } + + + protected String getRequestPath() { + Set<String> uniqueResources = extractUniqueResourceSetFromKeys(requestProperties.stringPropertyNames()); + BitSet bitset = new BitSet(); + for(String key : uniqueResources) { + if(tagValues.containsKey(key)) { + Object tmpValue = tagValues.get(key); + if(tmpValue != null) { + String value = tmpValue.toString(); + int bitIndex = Integer.parseInt(value); + bitset.set(bitIndex); + } + } + } + return bitsetPaths.get(bitset); + } + public abstract URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException; public abstract String toJSONString(); @@ -228,9 +311,32 @@ public abstract class AAIRequest { return response; } + protected static Set<String> extractUniqueResourceSetFromKeys(Set<String> keySet) { + Set<String> uniqueResources = new TreeSet<String>(); + List<String> keys = new ArrayList<String>(keySet); + for(String resource : keys) { + if(resource.contains(".")) { + String [] split = resource.split("\\."); + uniqueResources.add(split[0].replaceAll("_", "-")); + } + } + return uniqueResources; + } + public void processRequestPathValues(Map<String, String> nameValues) { + Set<String> uniqueResources = extractUniqueResourceSetFromKeys(nameValues.keySet()); + + Set<String> tokens = new TreeSet<String>(); + tokens.add(DEPTH); + tokens.addAll(Arrays.asList(this.getArgsList())); - String[] arguments = this.getArgsList(); + for(String resoourceName:uniqueResources) { + AAIRequest locRequest = AAIRequest.createRequest(resoourceName, nameValues); + if(locRequest != null) + tokens.addAll(Arrays.asList(locRequest.getArgsList())); + } + + String[] arguments = tokens.toArray(new String[0]); for(String name : arguments) { String tmpName = name.replaceAll("-", "_"); String value = nameValues.get(tmpName); @@ -249,12 +355,57 @@ public abstract class AAIRequest { return false; } - ObjectMapper getObjectMapper() { - ObjectMapper mapper = new ObjectMapper(); - AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(TypeFactory.defaultInstance()); - // if ONLY using JAXB annotations: - mapper.setAnnotationIntrospector(introspector); - mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - return mapper; + public static ObjectMapper getObjectMapper() { + return AAIService.getObjectMapper(); + } + + protected static Class<? extends AAIDatum> getClassFromResource(String resoourceName) throws ClassNotFoundException { + String className = GenericVnf.class.getName(); + String[] split = resoourceName.split("-"); + for(int i = 0; i < split.length; i++) { + split[i] = StringUtils.capitalize(split[i]); + } + + String caps = StringUtils.join(split); + className = className.replace("GenericVnf", caps); + Class<? extends AAIDatum> clazz = null; + try { + clazz = (Class<? extends AAIDatum>)Class.forName(className); + } catch (ClassNotFoundException e) { + LOG.warn("AAIRequest does not support class: " + e.getMessage()); + return null; + } + + return clazz; } + + protected static AAIRequest getRequestFromResource(String resoourceName) { + + Class<? extends AAIDatum> clazz = null; + try { + clazz = getClassFromResource(resoourceName); + } catch (ClassNotFoundException e) { + LOG.warn("AAIRequest does not support class: " + e.getMessage()); + return null; + } + if(clazz == null) { + return null; + } + GenericRequest request = new GenericRequest(clazz); + return request; + } + + public static Map<String, String> splitQuery(String query) throws UnsupportedEncodingException { + Map<String, String> query_pairs = new LinkedHashMap<String, String>(); + + if(query != null && !query.isEmpty()) { + String[] pairs = query.split("&"); + for (String pair : pairs) { + int idx = pair.indexOf("="); + query_pairs.put(URLDecoder.decode(pair.substring(0, idx), "UTF-8"), URLDecoder.decode(pair.substring(idx + 1), "UTF-8")); + } + } + return query_pairs; + } + } diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java index 5b9ec75..8feba08 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIService.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,24 +25,35 @@ package org.openecomp.sdnc.sli.aai; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.security.KeyManagementException; +import java.security.KeyStore; +import java.security.NoSuchAlgorithmException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; import java.util.Enumeration; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; +import java.util.Set; import java.util.TimeZone; import java.util.UUID; import java.util.regex.Matcher; @@ -50,26 +61,21 @@ import java.util.regex.Pattern; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocketFactory; import javax.ws.rs.HttpMethod; import javax.ws.rs.core.UriBuilder; +import javax.xml.bind.annotation.XmlElement; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang3.StringUtils; -import org.openecomp.aai.inventory.v8.AvailabilityZone; -import org.openecomp.aai.inventory.v8.GenericVnf; -import org.openecomp.aai.inventory.v8.L3Network; -import org.openecomp.aai.inventory.v8.PInterface; -import org.openecomp.aai.inventory.v8.PhysicalLink; -import org.openecomp.aai.inventory.v8.Pserver; -import org.openecomp.aai.inventory.v8.ResultData; -import org.openecomp.aai.inventory.v8.SearchResults; -import org.openecomp.aai.inventory.v8.Service; -import org.openecomp.aai.inventory.v8.ServiceInstance; -import org.openecomp.aai.inventory.v8.Tenant; -import org.openecomp.aai.inventory.v8.Vserver; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.openecomp.sdnc.sli.ConfigurationException; -import org.openecomp.sdnc.sli.MetricLogger; + import org.openecomp.sdnc.sli.SvcLogicContext; import org.openecomp.sdnc.sli.SvcLogicException; import org.openecomp.sdnc.sli.SvcLogicResource; @@ -80,59 +86,40 @@ import org.openecomp.sdnc.sli.aai.data.ResourceVersion; import org.openecomp.sdnc.sli.aai.data.ServiceException; import org.openecomp.sdnc.sli.aai.data.notify.NotifyEvent; import org.openecomp.sdnc.sli.aai.data.v1507.VServer; -import org.openecomp.sdnc.sli.aai.update.Update; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.AnnotationIntrospector; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; import com.fasterxml.jackson.databind.type.TypeFactory; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; +import com.sun.jersey.api.client.config.DefaultClientConfig; +import com.sun.jersey.client.urlconnection.HTTPSProperties; + +import org.openecomp.aai.inventory.v8.*; public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicResource { public static final String AAICLIENT_PROPERTIES = "/aaiclient.properties"; + public static final String PATH_PROPERTIES = "/aai-path.properties"; private static final Logger LOG = LoggerFactory.getLogger(AAIService.class); private final String truststore_path; private final String truststore_password; -// private final String keystore_path; -// private final String keystore_password; + private final String keystore_path; + private final String keystore_password; private final Boolean ignore_certificate_host_error; private final String target_uri; - private final String query_path; - private final String network_vce_path; - - private final String network_vpe_path; - - private final String network_vpls_pe_path; - - private final String network_complex_path; - - private final String network_pserver_path; + private final String query_path; // = "sdn-zone-query"; private final String network_vserver_path; - private final String ctag_pool_path; - private final String svc_instance_path; private final String svc_inst_qry_path; - private final String generic_vnf_path; - - private final String network_dvsswitch_path; - - private final String l3_network_path; - private final String l3_network_path_query_name; - - private final String vpn_binding_path; - - private final String vnf_image_path; private final String vnf_image_query_path; private final String param_format; //= "filter=%s:%s"; @@ -145,8 +132,6 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe private final String selflink_fqdn; private final String p_interface_path; - private final String physical_link_path; - private final String customer_path; private final String service_path; private final String site_pair_set_path; @@ -164,12 +149,25 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe private String user_name; private String user_password; - private final MetricLogger ml = new MetricLogger(); + // runtime + private final boolean runtimeOSGI; + + private SSLContext CTX; + +// private final MetricLogger ml = new MetricLogger(); private final AAIRequestExecutor executor; public AAIService(URL propURL) { LOG.info("Entered AAIService.ctor"); + + String runtime = System.getProperty("aaiclient.runtime"); + if(runtime != null && runtime.equals("OSGI")) { + runtimeOSGI = true; + } else { + runtimeOSGI = false; + } + Properties props = null; try { props = initialize(propURL); @@ -193,6 +191,8 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe truststore_path = props.getProperty(TRUSTSTORE_PATH); truststore_password = props.getProperty(TRUSTSTORE_PSSWD); + keystore_path = props.getProperty(KEYSTORE_PATH); + keystore_password = props.getProperty(KEYSTORE_PSSWD); target_uri = props.getProperty(TARGET_URI); query_path = props.getProperty(QUERY_PATH); @@ -222,21 +222,8 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe connection_timeout = tmpConnectionTimeout; read_timeout = tmpReadTimeout; - network_vce_path = props.getProperty(NETWORK_VCE_PATH); - - network_vpe_path = props.getProperty(NETWORK_VPE_PATH); - - network_vpls_pe_path =props.getProperty(NETWORK_VPLS_PE_PATH); - - network_complex_path =props.getProperty(NETWORK_COMPLEX_PATH); - - network_pserver_path =props.getProperty(NETWORK_PSERVER_PATH); - network_vserver_path =props.getProperty(NETWORK_VSERVER_PATH); - ctag_pool_path =props.getProperty(CTAG_POOL_PATH); - - svc_instance_path = props.getProperty(SVC_INSTANCE_PATH); // "/aai/v1/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances"); // "/aai/v1/business/customers/customer/ma9181-203-customerid/service-subscriptions/service-subscription/ma9181%20Hosted%20Voice/service-instances"; @@ -252,27 +239,12 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe // P-Interfaces p_interface_path = props.getProperty(P_INTERFACE_PATH); - // Physical Link - physical_link_path = props.getProperty(PHYSICAL_LINK_PATH); - - generic_vnf_path = props.getProperty(GENERIC_VNF_PATH); - - network_dvsswitch_path = props.getProperty(NETWORK_DVSSWITCH_PATH); - - l3_network_path = props.getProperty(L3_NETWORK_PATH); - l3_network_path_query_name = props.getProperty(L3_NETWORK_PATH_QUERY_NAME); - - vpn_binding_path = props.getProperty(VPN_BINDING_PATH); - - vnf_image_path = props.getProperty(VNF_IMAGE_PATH); vnf_image_query_path = props.getProperty(VNF_IMAGE_QUERY_PATH); ubb_notify_path = props.getProperty(UBB_NOTIFY_PATH); selflink_avpn = props.getProperty(SELFLINK_AVPN); selflink_fqdn = props.getProperty(SELFLINK_FQDN); - customer_path = props.getProperty(CUSTOMER_PATH); - service_path = props.getProperty(SERVICE_PATH); site_pair_set_path = props.getProperty(SITE_PAIR_SET_PATH); @@ -287,18 +259,92 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe ignore_certificate_host_error = host_error; - HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){ - public boolean verify(String string,SSLSession ssls) { - return ignore_certificate_host_error; - } - }); + HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){ + public boolean verify(String string,SSLSession ssls) { + return ignore_certificate_host_error; + } + }); if(truststore_path != null && truststore_password != null && (new File(truststore_path)).exists()) { System.setProperty("javax.net.ssl.trustStore", truststore_path); System.setProperty("javax.net.ssl.trustStorePassword", truststore_password); } + if(keystore_path != null && keystore_password != null && (new File(keystore_path)).exists()) + { + DefaultClientConfig config = new DefaultClientConfig(); + //both jersey and HttpURLConnection can use this + SSLContext ctx = null; + try { + ctx = SSLContext.getInstance("TLS"); + + KeyManagerFactory kmf = null; + try { + String def = "SunX509"; + String storeType = "PKCS12"; + def = KeyStore.getDefaultType(); + kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); + FileInputStream fin = new FileInputStream(keystore_path); +// KeyStore ks = KeyStore.getInstance("PKCS12"); + + String extension = keystore_path.substring(keystore_path.lastIndexOf(".") + 1); + + if(extension != null && !extension.isEmpty() && extension.equalsIgnoreCase("JKS")) { + storeType = "JKS"; + } + KeyStore ks = KeyStore.getInstance(storeType); + + char[] pwd = keystore_password.toCharArray(); + ks.load(fin, pwd); + kmf.init(ks, pwd); + } catch (Exception ex) { + LOG.error("AAIResource", ex); + } + + ctx.init(kmf.getKeyManagers(), null, null); + config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, new HTTPSProperties( new HostnameVerifier() { + @Override + public boolean verify( String s, SSLSession sslSession ) { + return ignore_certificate_host_error; + } + }, ctx)); + + CTX = ctx; + LOG.debug("SSLContext created"); + + } catch (KeyManagementException | NoSuchAlgorithmException exc) { + LOG.error("AAIResource", exc); + } + } + LOG.info("AAIResource.ctor initialized."); + + try { + Field methodsField = HttpURLConnection.class.getDeclaredField("methods"); + methodsField.setAccessible(true); + // get the methods field modifiers + Field modifiersField = Field.class.getDeclaredField("modifiers"); + // bypass the "private" modifier + modifiersField.setAccessible(true); + + // remove the "final" modifier + modifiersField.setInt(methodsField, methodsField.getModifiers() & ~Modifier.FINAL); + + /* valid HTTP methods */ + String[] methods = { + "GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "TRACE", "PATCH" + }; + // set the new methods - including patch + methodsField.set(null, methods); + + } catch (SecurityException | IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) { + e.printStackTrace(); + } + + } + + public void cleanUp() { + } /** @@ -320,26 +366,30 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe con.setReadTimeout( read_timeout ); con.setRequestMethod( method ); con.setRequestProperty( "Accept", "application/json" ); - con.setRequestProperty( "Content-Type", "application/json" ); + con.setRequestProperty( "Content-Type", "PATCH".equalsIgnoreCase(method) ? "application/merge-patch+json" : "application/json" ); con.setRequestProperty("X-FromAppId", application_id); con.setRequestProperty("X-TransactionId",TransactionIdTracker.getNextTransactionId()); +// con.setRequestProperty(MetricLogger.REQUEST_ID, ml.getRequestID()); - if(user_name != null && !user_name.isEmpty() && user_password != null && !user_password.isEmpty()) { - String basicAuth = "Basic " + new String(Base64.encodeBase64((user_name + ":" + user_password).getBytes())); - con.setRequestProperty ("Authorization", basicAuth); - } + if(user_name != null && !user_name.isEmpty() && user_password != null && !user_password.isEmpty()) { + String basicAuth = "Basic " + new String(Base64.encodeBase64((user_name + ":" + user_password).getBytes())); + con.setRequestProperty ("Authorization", basicAuth); + } + if(con instanceof HttpsURLConnection && CTX != null) { + SSLSocketFactory sockFact = CTX.getSocketFactory(); + HttpsURLConnection.class.cast(con).setSSLSocketFactory( sockFact ); + } return con; } - @Override public GenericVnf requestGenericVnfData(String vnf_id) throws AAIServiceException { GenericVnf response = null; try { - AAIRequest request = new GenericVnfRequest(); - request.addRequestProperty(GenericVnfRequest.GENERIC_VNF_ID, vnf_id); + AAIRequest request = AAIRequest.getRequestFromResource("generic-vnf"); + request.addRequestProperty("generic-vnf.vnf-id", vnf_id); String rv = executor.get(request); if(rv != null) { ObjectMapper mapper = getObjectMapper(); @@ -361,8 +411,8 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe boolean response = false; try { - AAIRequest request = new GenericVnfRequest(); - request.addRequestProperty(GenericVnfRequest.GENERIC_VNF_ID, vnf_id); + AAIRequest request = AAIRequest.getRequestFromResource("generic-vnf"); + request.addRequestProperty("generic-vnf.vnf-id", vnf_id); request.setRequestObject(data); response = executor.post(request); } catch(AAIServiceException aaiexc) { @@ -377,76 +427,20 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe @Override public boolean deleteGenericVnfData(String vnf_id, String resourceVersion) throws AAIServiceException { boolean response = false; - InputStream inputStream = null; try { - - String request_url = target_uri+generic_vnf_path; - - String encoded_vnf = encodeQuery(vnf_id); - request_url = request_url.replace("{vnf-id}", encoded_vnf) ; - if(resourceVersion!=null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.DELETE); - - LOGwriteFirstTrace(HttpMethod.DELETE, http_req_url.toString()); - LOGwriteDateTrace("vnf_id", vnf_id); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - String line = null; - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", stringBuilder.toString()); - response = true; - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - response = false; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } - + AAIRequest request = AAIRequest.getRequestFromResource("generic-vnf"); + request.addRequestProperty("generic-vnf.vnf-id", vnf_id); + response = executor.delete(request, resourceVersion); } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { LOG.warn("deleteGenericVnfData", exc); throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } } return response; } - - @Override public SearchResults requestServiceInstanceURL(String svc_instance_id) throws AAIServiceException { SearchResults response = null; @@ -477,11 +471,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - ObjectMapper mapper = new ObjectMapper(); - AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(TypeFactory.defaultInstance()); - // if ONLY using JAXB annotations: - mapper.setAnnotationIntrospector(introspector); - mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + ObjectMapper mapper = getObjectMapper(); if (responseCode == HttpURLConnection.HTTP_OK) { // StringBuilder stringBuilder = new StringBuilder("\n"); @@ -592,153 +582,45 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe @Override public ServiceInstance requestServiceInterfaceData(String customer_id, String service_type, String svc_instance_id) throws AAIServiceException { ServiceInstance response = null; - InputStream inputStream = null; try { - String path = svc_instance_path; - path = path.replace("{customer-id}", encodeQuery(customer_id)); - path = path.replace("{service-type}", encodeQuery(service_type)); - String request_url = target_uri+path; - if(!request_url.endsWith("/")) { - request_url = request_url + "/service-instance/"; - } else { - request_url = request_url + "service-instance/"; - } - request_url = request_url + encodeQuery(svc_instance_id); - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.GET); - - LOGwriteFirstTrace(HttpMethod.GET, http_req_url.toString()); - LOGwriteDateTrace("customer_id", customer_id); - LOGwriteDateTrace("service_type", service_type); - LOGwriteDateTrace("svc_instance_id", svc_instance_id); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK) { -// StringBuilder stringBuilder = new StringBuilder("\n"); -// String line = null; -// while( ( line = reader.readLine() ) != null ) { -// stringBuilder.append("\n").append( line ); -// } -// LOG.info(stringBuilder.toString()); - response = mapper.readValue(reader, ServiceInstance.class); - LOGwriteEndingTrace(HttpURLConnection.HTTP_OK, "SUCCESS", mapper.writeValueAsString(response)); - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - return response; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } + AAIRequest request = AAIRequest.getRequestFromResource("service-instance"); + request.addRequestProperty("customer.global-customer-id", customer_id); + request.addRequestProperty("ervice-subscription.service-type", service_type); + request.addRequestProperty("service-instance.service-instance-id", svc_instance_id); + String rv = executor.get(request); + if(rv != null) { + ObjectMapper mapper = getObjectMapper(); + response = mapper.readValue(rv, ServiceInstance.class); + } } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { LOG.warn("requestServiceInterfaceData", exc); throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } } return response; } @Override - public boolean postServiceInterfaceData(String customer_id, String service_type, String svc_instance_id, ServiceInstance request) throws AAIServiceException { - - InputStream inputStream = null; + public boolean postServiceInterfaceData(String customer_id, String service_type, String svc_instance_id, ServiceInstance data) throws AAIServiceException { + boolean response = false; try { - ObjectMapper mapper = getObjectMapper(); - String json_text = mapper.writeValueAsString(request); - - String path = svc_instance_path; - path = path.replace("{customer-id}", encodeQuery(customer_id)); - path = path.replace("{service-type}", encodeQuery(service_type)); - String request_url = target_uri+path; - if(!request_url.endsWith("/")) { - request_url = request_url + "/service-instance/"; - } else { - request_url = request_url + "service-instance/"; - } - request_url = request_url + encodeQuery(svc_instance_id); - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.PUT); - - OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); - osw.write(json_text); - osw.flush(); - osw.close(); - - - LOGwriteFirstTrace("PUT", request_url); - LOGwriteDateTrace("customer_id", customer_id); - LOGwriteDateTrace("service_type", service_type); - LOGwriteDateTrace("svc_instance_id", svc_instance_id); - LOGwriteDateTrace("RelationshipList", json_text); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - BufferedReader reader; - String line = null; - reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", (stringBuilder != null) ? stringBuilder.toString() : "{no-data}"); - return true; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - - throw new AAIServiceException(responseCode, errorresponse); - } + AAIRequest request = AAIRequest.getRequestFromResource("service-instance"); + request.addRequestProperty("customer.customer-id", customer_id); + request.addRequestProperty("service-subscription.service-type", service_type); + request.addRequestProperty("service-instance.service-instance-id", svc_instance_id); + request.setRequestObject(data); + response = executor.post(request); } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { - LOG.warn("postServiceInterfaceData", exc); + LOG.warn("requestGenericVnfData", exc); throw new AAIServiceException(exc); - } finally { - try { - if(inputStream != null) - inputStream.close(); - } catch (Exception exc) { - - } } + return response; } /* @@ -855,18 +737,18 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe /* * (non-Javadoc) - * @see org.openecomp.sdnc.sli.aai.AAIClient#requestVServersData(java.lang.String, java.lang.String) + * @see org.openecomp.sdnct.sli.aai.AAIClient#requestVServersData(java.lang.String, java.lang.String) */ @Override - public Vserver requestVServerData(String tenant_id, String vserver_id, String cloudOwner, String cloudRegionId) throws AAIServiceException { + public Vserver requestVServerData(String tenantId, String vserverId, String cloudOwner, String cloudRegionId) throws AAIServiceException { Vserver response = null; try { - AAIRequest request = new VserverRequest(); - request.addRequestProperty(TenantRequest.TENANT_TENANT_ID, tenant_id); - request.addRequestProperty(VserverRequest.VSERVER_VSERVER_ID, vserver_id); - request.addRequestProperty(CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER, cloudOwner); - request.addRequestProperty(CloudRegionRequest.CLOUD_REGION_CLOUD_REGION_ID, cloudRegionId); + AAIRequest request = AAIRequest.getRequestFromResource("vserver"); + request.addRequestProperty("cloud-region.cloud-owner", cloudOwner); + request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId); + request.addRequestProperty("tenant.tenant-id", tenantId); + request.addRequestProperty("vserver.vserver-id", vserverId); String rv = executor.get(request); if(rv != null) { @@ -884,80 +766,24 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe @Override - public boolean postVServerData(String tenantId, String vserverId, String cloudOwner, String cloudRegionId, Vserver request) throws AAIServiceException { - InputStream inputStream = null; + public boolean postVServerData(String tenantId, String vserverId, String cloudOwner, String cloudRegionId, Vserver data) throws AAIServiceException { + boolean response = false; try { - - ObjectMapper mapper = getObjectMapper(); - String json_text = mapper.writeValueAsString(request); - - String local_network_complexes_path = network_vserver_path.replace("{tenant-id}", encodeQuery(tenantId)); - local_network_complexes_path = local_network_complexes_path.replace("{vserver-id}", encodeQuery(vserverId)); - - local_network_complexes_path = local_network_complexes_path.replace("{cloud-owner}", encodeQuery(cloudOwner)); - local_network_complexes_path = local_network_complexes_path.replace("{cloud-region-id}", encodeQuery(cloudRegionId)); - - String request_url = target_uri+local_network_complexes_path; - - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.PUT); - - OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); - osw.write(json_text); - osw.flush(); - osw.close(); - - - LOGwriteFirstTrace("PUT", request_url); - LOGwriteDateTrace("tenant-id", tenantId); - LOGwriteDateTrace("vserver-id", vserverId); - LOGwriteDateTrace("cloud-owner", cloudOwner); - LOGwriteDateTrace("cloud-region-id", cloudRegionId); - - LOGwriteDateTrace("Vserver", json_text); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - BufferedReader reader; - String line = null; - reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", (stringBuilder != null) ? stringBuilder.toString() : "{no-data}"); - return true; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - - throw new AAIServiceException(responseCode, errorresponse); - } + AAIRequest request = AAIRequest.getRequestFromResource("vserver"); + request.addRequestProperty("cloud-region.cloud-owner", cloudOwner); + request.addRequestProperty("cloud-region.cloud-region-id", cloudRegionId); + request.addRequestProperty("tenant.tenant-id", tenantId); + request.addRequestProperty("vserver.vserver-id", vserverId); + request.setRequestObject(data); + response = executor.post(request); } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { - LOG.warn("postVServerData", exc); + LOG.warn("postNetworkComplexData", exc); throw new AAIServiceException(exc); - } finally { - try { - if(inputStream != null) - inputStream.close(); - } catch (Exception exc) { - - } } + return response; } @Override @@ -1041,203 +867,55 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe @Override public PhysicalLink requestPhysicalLinkData(String linkName) throws AAIServiceException { PhysicalLink response = null; - InputStream inputStream = null; try { - String request_url = target_uri+physical_link_path; - - String encoded_vnf = encodeQuery(linkName); - request_url = request_url.replace("{link-name}", encoded_vnf) ; - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.GET); - - LOGwriteFirstTrace(HttpMethod.GET, http_req_url.toString()); - LOGwriteDateTrace("link-name", linkName); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK) { -// StringBuilder stringBuilder = new StringBuilder("\n"); -// String line = null; -// while( ( line = reader.readLine() ) != null ) { -// stringBuilder.append("\n").append( line ); -// } -// LOG.info(stringBuilder.toString()); - response = mapper.readValue(reader, PhysicalLink.class); - LOGwriteEndingTrace(HttpURLConnection.HTTP_OK, "SUCCESS", mapper.writeValueAsString(response)); - } else if (responseCode == HttpURLConnection.HTTP_NOT_FOUND) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - return response; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } + AAIRequest request = AAIRequest.getRequestFromResource("physical-link"); + request.addRequestProperty("physical-link.link-name", linkName); + String rv = executor.get(request); + if(rv != null) { + ObjectMapper mapper = getObjectMapper(); + response = mapper.readValue(rv, PhysicalLink.class); + } } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { LOG.warn("requestPhysicalLinkData", exc); throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } } return response; } @Override - public boolean postPhysicalLinkData(String linkName, PhysicalLink request) throws AAIServiceException { - InputStream inputStream = null; - + public boolean postPhysicalLinkData(String linkName, PhysicalLink data) throws AAIServiceException { + boolean response = false; try { - - ObjectMapper mapper = getObjectMapper(); - String json_text = mapper.writeValueAsString(request); - - String request_url = target_uri+physical_link_path; - String encoded_vnf = encodeQuery(linkName); - request_url = request_url.replace("{link-name}", encoded_vnf) ; - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.PUT); - - OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); - osw.write(json_text); - osw.flush(); - osw.close(); - - - LOGwriteFirstTrace("PUT", request_url); - LOGwriteDateTrace("link-name", linkName); - LOGwriteDateTrace("PhysicalLink", json_text); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - BufferedReader reader; - String line = null; - reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", (stringBuilder != null) ? stringBuilder.toString() : "{no-data}"); - return true; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - - throw new AAIServiceException(responseCode, errorresponse); - } + AAIRequest request = AAIRequest.getRequestFromResource("physical-link"); + request.addRequestProperty("physical-link.link-name", linkName); + request.setRequestObject(data); + response = executor.post(request); } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { - LOG.warn("postPhysicalLinkData", exc); + LOG.warn(new Object(){}.getClass().getEnclosingMethod().getName(), exc); throw new AAIServiceException(exc); - } finally { - try { - if(inputStream != null) - inputStream.close(); - } catch (Exception exc) { - - } } + return response; } @Override public boolean deletePhysicalLinkData(String linkName, String resourceVersion) throws AAIServiceException { boolean response = false; - InputStream inputStream = null; try { - String request_url = target_uri+physical_link_path; - String encoded_vnf = encodeQuery(linkName); - request_url = request_url.replace("{link-name}", encoded_vnf) ; - if(resourceVersion!=null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.DELETE); - - LOGwriteFirstTrace("DELETE", http_req_url.toString()); - LOGwriteDateTrace("link-name", linkName); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - String line = null; - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", stringBuilder.toString()); - response = true; - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - response = false; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } - + AAIRequest request = AAIRequest.getRequestFromResource("physical-link"); + request.addRequestProperty("physical-link.link-name", linkName); + response = executor.delete(request, resourceVersion); } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { LOG.warn("deletePhysicalLinkData", exc); throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } } return response; } @@ -1250,7 +928,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe try { AAIRequest request = new PInterfaceRequest(); request.addRequestProperty(PInterfaceRequest.PINTERFACE_INTERFACE_NAME, interfaceName); - request.addRequestProperty(PInterfaceRequest.HOSTNAME, hostname); + request.addRequestProperty(PInterfaceRequest.PSERVER_HOSTNAME, hostname); String rv = executor.get(request); if(rv != null) { ObjectMapper mapper = getObjectMapper(); @@ -1274,6 +952,8 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe ObjectMapper mapper = getObjectMapper(); String json_text = mapper.writeValueAsString(request); + SSLSocketFactory sockFact = CTX.getSocketFactory(); + String request_url = target_uri+p_interface_path; String encoded_vnf = encodeQuery(hostname); request_url = request_url.replace("{hostname}", encoded_vnf) ; @@ -1339,75 +1019,21 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe @Override public boolean deletePInterfaceData(String hostname, String interfaceName, String resourceVersion) throws AAIServiceException { boolean response = false; - InputStream inputStream = null; try { - String request_url = target_uri+p_interface_path; - String encoded_vnf = encodeQuery(hostname); - request_url = request_url.replace("{hostname}", encoded_vnf) ; - encoded_vnf = encodeQuery(interfaceName); - request_url = request_url.replace("{interface-name}", encoded_vnf) ; - if(resourceVersion!=null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.DELETE); - - LOGwriteFirstTrace("DELETE", http_req_url.toString()); - LOGwriteDateTrace("hostname", hostname); - LOGwriteDateTrace("interface-name", interfaceName); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - String line = null; - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", stringBuilder.toString()); - response = true; - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - response = false; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } - + AAIRequest request = AAIRequest.getRequestFromResource("p-interface"); + request.addRequestProperty("p-interface.interface-name", interfaceName); + request.addRequestProperty("pserver.hostname", hostname); + response = executor.delete(request, resourceVersion); } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { LOG.warn("deletePInterfaceData", exc); throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } } return response; } - + //================== End of SitePairSet ================= //==================== Service ====================== @Override public Service requestServiceData(String serviceId) throws AAIServiceException { @@ -1415,60 +1041,20 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe InputStream inputStream = null; try { - String request_url = target_uri+service_path; - - String encoded_vnf = encodeQuery(serviceId); - request_url = request_url.replace("{service-id}", encoded_vnf) ; - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.GET); - - LOGwriteFirstTrace(HttpMethod.GET, http_req_url.toString()); - LOGwriteDateTrace("service-id", serviceId); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); + AAIRequest request = AAIRequest.getRequestFromResource("service"); + request.addRequestProperty("service.service-id", serviceId); - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK) { -// StringBuilder stringBuilder = new StringBuilder("\n"); -// String line = null; -// while( ( line = reader.readLine() ) != null ) { -// stringBuilder.append("\n").append( line ); -// } -// LOG.info(stringBuilder.toString()); - response = mapper.readValue(reader, Service.class); - LOGwriteEndingTrace(HttpURLConnection.HTTP_OK, "SUCCESS", mapper.writeValueAsString(response)); - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } + String rv = executor.get(request); + if(rv != null) { + ObjectMapper mapper = getObjectMapper(); + response = mapper.readValue(rv, Service.class); + } } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { LOG.warn("requestServiceData", exc); throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } } return response; } @@ -1482,6 +1068,8 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe ObjectMapper mapper = getObjectMapper(); String json_text = mapper.writeValueAsString(request); + SSLSocketFactory sockFact = CTX.getSocketFactory(); + String request_url = target_uri+service_path; String encoded_vnf = encodeQuery(linkName); request_url = request_url.replace("{service-id}", encoded_vnf) ; @@ -1542,71 +1130,20 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe } @Override - public boolean deleteServiceData(String linkName, String resourceVersion) throws AAIServiceException { + public boolean deleteServiceData(String service_id, String resourceVersion) throws AAIServiceException { boolean response = false; - InputStream inputStream = null; try { - String request_url = target_uri+service_path; - String encoded_vnf = encodeQuery(linkName); - request_url = request_url.replace("{service-id}", encoded_vnf) ; - if(resourceVersion!=null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.DELETE); - - LOGwriteFirstTrace("DELETE", http_req_url.toString()); - LOGwriteDateTrace("service-id", linkName); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - String line = null; - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", stringBuilder.toString()); - response = true; - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - response = false; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } - + AAIRequest request = AAIRequest.getRequestFromResource("service"); + request.addRequestProperty("service.service-id", service_id); + response = executor.delete(request, resourceVersion); } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { LOG.warn("deleteServiceData", exc); throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } } + return response; } //================== End of Service ================= @@ -1731,6 +1268,9 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.DELETE); +// SSLSocketFactory sockFact = CTX.getSocketFactory(); +// con.setSSLSocketFactory( sockFact ); + LOGwriteFirstTrace("DELETE", http_req_url.toString()); @@ -1820,278 +1360,24 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe } @Override - public Pserver requestPServerData(String hostname) throws AAIServiceException { - Pserver response = null; - InputStream inputStream = null; - - try { - String request_url = target_uri+network_pserver_path; - String encoded_vnf = encodeQuery(hostname); - request_url = request_url.replace("{hostname}", encoded_vnf) ; - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.GET); - - LOGwriteFirstTrace(HttpMethod.GET, http_req_url.toString()); - LOGwriteDateTrace("hostname", hostname); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK) { -// StringBuilder stringBuilder = new StringBuilder("\n"); -// String line = null; -// while( ( line = reader.readLine() ) != null ) { -// stringBuilder.append("\n").append( line ); -// } -// LOG.info(stringBuilder.toString()); - response = mapper.readValue(reader, Pserver.class); - LOGwriteEndingTrace(HttpURLConnection.HTTP_OK, "SUCCESS", mapper.writeValueAsString(response)); - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - return response; - } else { - ErrorResponse errorresponse = new ErrorResponse(); - try { - errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } catch(Exception exc) { - } - throw new AAIServiceException(responseCode, errorresponse); - } - - } catch(AAIServiceException aaiexc) { - throw aaiexc; - } catch (Exception exc) { - LOG.warn("requestPServerData", exc); - throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } - } - return response; - } - - @Override - public boolean postPServerData(String hostname, Pserver request) throws AAIServiceException { - InputStream inputStream = null; - - try { - - ObjectMapper mapper = getObjectMapper(); - String json_text = mapper.writeValueAsString(request); - - String request_url = target_uri+network_pserver_path; - - request_url = request_url.replace("{hostname}", encodeQuery(hostname)) ; - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.PUT); - - OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); - osw.write(json_text); - osw.flush(); - osw.close(); - - - LOGwriteFirstTrace("PUT", request_url); - LOGwriteDateTrace("hostname", hostname); - LOGwriteDateTrace("PServer", json_text); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - BufferedReader reader; - String line = null; - reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", (stringBuilder != null) ? stringBuilder.toString() : "{no-data}"); - return true; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - - throw new AAIServiceException(responseCode, errorresponse); - } - } catch(AAIServiceException aaiexc) { - throw aaiexc; - } catch (Exception exc) { - LOG.warn("postPServerData", exc); - throw new AAIServiceException(exc); - } finally { - try { - if(inputStream != null) - inputStream.close(); - } catch (Exception exc) { - - } - } - } - - @Override - public boolean deletePServerData(String hostname, String resourceVersion) throws AAIServiceException { - boolean response = false; - InputStream inputStream = null; - - try { - - String request_url = target_uri+network_pserver_path; - - String encoded_vnf = encodeQuery(hostname); - request_url = request_url.replace("{hostname}", encoded_vnf) ; - if(resourceVersion!=null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.DELETE); - - LOGwriteFirstTrace("DELETE", http_req_url.toString()); - LOGwriteDateTrace("hostname", hostname); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - String line = null; - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", stringBuilder.toString()); - response = true; - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - response = true; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } - - } catch(AAIServiceException aaiexc) { - throw aaiexc; - } catch (Exception exc) { - LOG.warn("deletePServersData", exc); - throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } - } - return response; - } - - - @Override public L3Network requestL3NetworkData(String networkId) throws AAIServiceException { L3Network response = null; InputStream inputStream = null; try { - String request_url = target_uri+l3_network_path; - String encoded_vnf = encodeQuery(networkId); - request_url = request_url.replace("{network-id}", encoded_vnf) ; - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.GET); - - LOGwriteFirstTrace(HttpMethod.GET, http_req_url.toString()); - LOGwriteDateTrace("network-id", networkId); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK) { -// StringBuilder stringBuilder = new StringBuilder("\n"); -// String line = null; -// while( ( line = reader.readLine() ) != null ) { -// stringBuilder.append("\n").append( line ); -// } -// LOG.info(stringBuilder.toString()); - response = mapper.readValue(reader, L3Network.class); - LOGwriteEndingTrace(HttpURLConnection.HTTP_OK, "SUCCESS", mapper.writeValueAsString(response)); - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - return response; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } + AAIRequest request = AAIRequest.getRequestFromResource("l3-network"); + request.addRequestProperty("l3-network.network-id", networkId); + String rv = executor.get(request); + if(rv != null) { + ObjectMapper mapper = getObjectMapper(); + response = mapper.readValue(rv, L3Network.class); + } } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { LOG.warn("requestL3NetworkData", exc); throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } } return response; } @@ -2102,53 +1388,19 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe InputStream inputStream = null; try { - String request_url = target_uri+l3_network_path_query_name; - String encoded_name = encodeQuery(networkName); - request_url = request_url.replace("{network-name}", encoded_name) ; - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.GET); + AAIRequest request = AAIRequest.getRequestFromResource("l3-network"); + request.addRequestProperty("l3-network.network-name", networkName); - LOGwriteFirstTrace(HttpMethod.GET, http_req_url.toString()); - LOGwriteDateTrace("network-name", networkName); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK) { -// StringBuilder stringBuilder = new StringBuilder("\n"); -// String line = null; -// while( ( line = reader.readLine() ) != null ) { -// stringBuilder.append("\n").append( line ); -// } -// LOG.info(stringBuilder.toString()); - response = mapper.readValue(reader, L3Network.class); - LOGwriteEndingTrace(HttpURLConnection.HTTP_OK, "SUCCESS", mapper.writeValueAsString(response)); - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - return response; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } + String rv = executor.get(request); + if(rv != null) { + ObjectMapper mapper = getObjectMapper(); + response = mapper.readValue(rv, L3Network.class); + } } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { - LOG.warn("requestL3NetworkData", exc); + LOG.warn("requestL3NetworkQueryByName", exc); throw new AAIServiceException(exc); } finally { if(inputStream != null){ @@ -2163,141 +1415,37 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe } @Override - public boolean postL3NetworkData(String networkId, L3Network request) throws AAIServiceException { - InputStream inputStream = null; - + public boolean postL3NetworkData(String networkId, L3Network data) throws AAIServiceException { + boolean response = false; try { - - ObjectMapper mapper = getObjectMapper(); - String json_text = mapper.writeValueAsString(request); - - String request_url = target_uri+l3_network_path; - - String encoded_vnf = encodeQuery(networkId); - request_url = request_url.replace("{network-id}", encoded_vnf) ; - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.PUT); - - OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); - osw.write(json_text); - osw.flush(); - osw.close(); - - - LOGwriteFirstTrace("PUT", request_url); - LOGwriteDateTrace("network-id", networkId); - LOGwriteDateTrace("GenericVnf", json_text); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - BufferedReader reader; - String line = null; - reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", (stringBuilder != null) ? stringBuilder.toString() : "{no-data}"); - return true; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - - throw new AAIServiceException(responseCode, errorresponse); - } + AAIRequest request = AAIRequest.getRequestFromResource("l3-network"); + request.addRequestProperty("l3-network.network-id", networkId); + request.setRequestObject(data); + response = executor.post(request); } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { - LOG.warn("postL3NetworkData", exc); + LOG.warn(new Object(){}.getClass().getEnclosingMethod().getName(), exc); throw new AAIServiceException(exc); - } finally { - try { - if(inputStream != null) - inputStream.close(); - } catch (Exception exc) { - - } } + return response; } @Override public boolean deleteL3NetworkData(String networkId, String resourceVersion) throws AAIServiceException { boolean response = false; - InputStream inputStream = null; try { - String request_url = target_uri+l3_network_path; - - String encoded_vnf = encodeQuery(networkId); - request_url = request_url.replace("{network-id}", encoded_vnf) ; - if(resourceVersion!=null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.DELETE); - - LOGwriteFirstTrace("DELETE", http_req_url.toString()); - LOGwriteDateTrace("network-id", networkId); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - LOG.debug("HttpURLConnection result:" + responseCode); - if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); - BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); - String line = null; - - ObjectMapper mapper = getObjectMapper(); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", stringBuilder.toString()); - response = true; - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - response = false; - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - throw new AAIServiceException(responseCode, errorresponse); - } - + AAIRequest request = AAIRequest.getRequestFromResource("l3-network"); + request.addRequestProperty("l3-network.network-id", networkId); + response = executor.delete(request, resourceVersion); } catch(AAIServiceException aaiexc) { throw aaiexc; } catch (Exception exc) { LOG.warn("deleteL3NetworkData", exc); throw new AAIServiceException(exc); - } finally { - if(inputStream != null){ - try { - inputStream.close(); - } catch(Exception exc) { - - } - } } + return response; } @@ -2317,6 +1465,8 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe ObjectMapper mapper = getObjectMapper(); String json_text = mapper.writeValueAsString(event); + SSLSocketFactory sockFact = CTX.getSocketFactory(); + String request_url = target_uri+ubb_notify_path; URL http_req_url = new URL(request_url); @@ -2543,10 +1693,10 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe try { entity = this.getResource(url.toString(), Vserver.class); - } - catch (Exception e) - { - LOG.error("Caught exception", e); + } catch (AAIServiceException exc) { + throw exc; + } catch (Exception e) { + throw new AAIServiceException(e); } return entity; } @@ -2568,10 +1718,8 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe String data_type = datum.getResourceType(); entity = new URL(datum.getResourceLink()); } - } - catch (Exception e) - { - LOG.error("Caught exception", e); + } catch (Exception e) { + throw new AAIServiceException(e); } return entity; } @@ -2585,19 +1733,25 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe HttpURLConnection con = null; URL requestUrl = null; + String requestId = UUID.randomUUID().toString(); + try { if(request.getRequestObject() != null) { - con = getConfiguredConnection(requestUrl = request.getRequestUrl(HttpMethod.POST, null), HttpMethod.POST); + requestUrl = request.getRequestUrl(HttpMethod.POST, null); + requestUrl = appendDepth(requestUrl, request); + con = getConfiguredConnection(requestUrl, HttpMethod.POST); String json_text = request.toJSONString(); LOGwriteDateTrace("data", json_text); - logMetricRequest("POST "+requestUrl.getPath(), json_text); + logMetricRequest(requestId, "POST "+requestUrl.getPath(), json_text, requestUrl.getPath()); OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); osw.write(json_text); osw.flush(); } else { - con = getConfiguredConnection(requestUrl = request.getRequestUrl(HttpMethod.GET, null), HttpMethod.GET); - logMetricRequest("GET "+requestUrl.getPath(), ""); + requestUrl = request.getRequestUrl(HttpMethod.GET, null); + requestUrl = appendDepth(requestUrl, request); + con = getConfiguredConnection(requestUrl, HttpMethod.GET); + logMetricRequest(requestId, "GET "+requestUrl.getPath(), "", requestUrl.getPath()); } // Check for errors @@ -2611,7 +1765,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe // Process the response LOG.debug("HttpURLConnection result:" + responseCode + " : " + responseMessage); - logMetricResponse(responseCode, responseMessage); + logMetricResponse(requestId, responseCode, responseMessage); if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); @@ -2692,15 +1846,41 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe return response; } + private URL appendDepth(URL requestUrl, AAIRequest request) throws MalformedURLException { + + String depth = request.requestProperties.getProperty("depth", "1"); + String path = requestUrl.toString(); + if(path.contains("?depth=") || path.contains("&depth=")) { + return requestUrl; + } else { + if(path.contains("?")) { + path = String.format("%s&depth=%s", path, depth); + } else { + path = String.format("%s?depth=%s", path, depth); + } + return new URL(path); + } + } + @Override public Boolean post(AAIRequest request) throws AAIServiceException { InputStream inputStream = null; + String requestId = UUID.randomUUID().toString(); try { String resourceVersion = null; AAIDatum instance = request.getRequestObject(); - if(instance instanceof ResourceVersion) { - resourceVersion = ((ResourceVersion)instance).getResourceVersion(); + + Method getResourceVersionMethod = instance.getClass().getMethod("getResourceVersion"); + if(getResourceVersionMethod != null){ + try { + getResourceVersionMethod.setAccessible(true); + Object object = getResourceVersionMethod.invoke(instance); + if(object != null) + resourceVersion = object.toString(); + } catch (InvocationTargetException x) { + Throwable cause = x.getCause(); + } } URL requestUrl = null; @@ -2709,7 +1889,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe String json_text = request.toJSONString(); LOGwriteDateTrace("data", json_text); - logMetricRequest("PUT "+requestUrl.getPath(), json_text); + logMetricRequest(requestId, "PUT "+requestUrl.getPath(), json_text, requestUrl.getPath()); OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); osw.write(json_text); @@ -2725,7 +1905,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe } LOG.debug("HttpURLConnection result:" + responseCode + " : " + responseMessage); - logMetricResponse(responseCode, responseMessage); + logMetricResponse(requestId,responseCode, responseMessage); // Process the response BufferedReader reader; @@ -2766,6 +1946,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe public Boolean delete(AAIRequest request, String resourceVersion) throws AAIServiceException { Boolean response = null; InputStream inputStream = null; + String requestId = UUID.randomUUID().toString(); if(resourceVersion == null) { throw new AAIServiceException("resource-version is required for DELETE request"); @@ -2774,7 +1955,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe try { URL requestUrl = null; HttpURLConnection conn = getConfiguredConnection(requestUrl = request.getRequestUrl(HttpMethod.DELETE, resourceVersion), HttpMethod.DELETE); - logMetricRequest("DELETE "+requestUrl.getPath(), ""); + logMetricRequest(requestId, "DELETE "+requestUrl.getPath(), "", requestUrl.getPath()); conn.setDoOutput(true); // if(request.isDeleteDataRequired()) { // String json_text = request.toJSONString(); @@ -2797,7 +1978,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe // Process the response LOG.debug("HttpURLConnection result:" + responseCode + " : " + responseMessage); - logMetricResponse(responseCode, responseMessage); + logMetricResponse(requestId,responseCode, responseMessage); if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)); BufferedReader reader = new BufferedReader( new InputStreamReader( inputStream ) ); @@ -2844,10 +2025,11 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe InputStream inputStream = null; HttpURLConnection con = null; URL requestUrl = null; + String requestId = UUID.randomUUID().toString(); try { con = getConfiguredConnection(requestUrl = request.getRequestQueryUrl(HttpMethod.GET), HttpMethod.GET); - logMetricRequest("GET "+requestUrl.getPath(), ""); + logMetricRequest(requestId, "GET "+requestUrl.getPath(), "", requestUrl.getPath()); // Check for errors String responseMessage = con.getResponseMessage(); @@ -2858,7 +2040,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe inputStream = con.getErrorStream(); } - logMetricResponse(responseCode, responseMessage); + logMetricResponse(requestId,responseCode, responseMessage); ObjectMapper mapper = getObjectMapper(); if (responseCode == HttpURLConnection.HTTP_OK) { @@ -2894,6 +2076,83 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe return response; } + @Override + public Boolean patch(AAIRequest request, String resourceVersion) throws AAIServiceException { + InputStream inputStream = null; + String requestId = UUID.randomUUID().toString(); + + try { + AAIDatum instance = request.getRequestObject(); + if(instance instanceof ResourceVersion) { + resourceVersion = ((ResourceVersion)instance).getResourceVersion(); + } + + URL requestUrl = null; + HttpURLConnection con = getConfiguredConnection(requestUrl = request.getRequestUrl("PATCH", resourceVersion), "PATCH"); + ObjectMapper mapper = getObjectMapper(); + String json_text = request.toJSONString(); + + LOGwriteDateTrace("data", json_text); + logMetricRequest(requestId, "PATCH "+requestUrl.getPath(), json_text, requestUrl.getPath()); + + OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); + osw.write(json_text); + osw.flush(); + + // Check for errors + String responseMessage = con.getResponseMessage(); + int responseCode = con.getResponseCode(); + if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { + inputStream = con.getInputStream(); + } else { + inputStream = con.getErrorStream(); + } + + LOG.info("HttpURLConnection result: " + responseCode + " : " + responseMessage); + logMetricResponse(requestId,responseCode, responseMessage); + + // Process the response + BufferedReader reader; + String line = null; + reader = new BufferedReader( new InputStreamReader( inputStream ) ); + mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + + if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { + StringBuilder stringBuilder = new StringBuilder(); + + while( ( line = reader.readLine() ) != null ) { + stringBuilder.append( line ); + } + LOGwriteEndingTrace(responseCode, responseMessage, (stringBuilder != null) ? stringBuilder.toString() : "{no-data}"); + return true; + } else { + StringBuilder stringBuilder = new StringBuilder(); + + while( ( line = reader.readLine() ) != null ) { + stringBuilder.append("\n").append( line ); + } + LOG.info(stringBuilder.toString()); + + + ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); + LOGwriteEndingTrace(responseCode, responseMessage, mapper.writeValueAsString(errorresponse)); + + throw new AAIServiceException(responseCode, errorresponse); + } + } catch(AAIServiceException aaiexc) { + throw aaiexc; + } catch (Exception exc) { + LOG.warn("AAIRequestExecutor.patch", exc); + throw new AAIServiceException(exc); + } finally { + try { + if(inputStream != null) + inputStream.close(); + } catch (Exception exc) { + + } + } + } } @Override @@ -3031,73 +2290,6 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe return LOG; } - @Override - public boolean updateAnAIEntry(Update request) throws AAIServiceException { - InputStream inputStream = null; - - try { - - ObjectMapper mapper = getObjectMapper(); - String json_text = mapper.writeValueAsString(request); - - String request_url = target_uri+update_path; - URL http_req_url = new URL(request_url); - - HttpURLConnection con = getConfiguredConnection(http_req_url, HttpMethod.PUT); - - OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); - osw.write(json_text); - osw.flush(); - osw.close(); - - LOGwriteFirstTrace("PUT", request_url); - LOGwriteDateTrace("Update", json_text); - - // Check for errors - int responseCode = con.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - inputStream = con.getInputStream(); - } else { - inputStream = con.getErrorStream(); - } - - // Process the response - BufferedReader reader; - String line = null; - reader = new BufferedReader( new InputStreamReader( inputStream ) ); - - if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) { - StringBuilder stringBuilder = new StringBuilder(); - - while( ( line = reader.readLine() ) != null ) { - stringBuilder.append( line ); - } - LOGwriteEndingTrace(responseCode, "SUCCESS", (stringBuilder != null) ? stringBuilder.toString() : "{no-data}"); - return true; - } else if(responseCode == HttpURLConnection.HTTP_NOT_FOUND ) { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "HTTP_NOT_FOUND", "Entry does not exist."); - throw new AAIServiceException(responseCode, errorresponse); - } else { - ErrorResponse errorresponse = mapper.readValue(reader, ErrorResponse.class); - LOGwriteEndingTrace(responseCode, "FAILURE", mapper.writeValueAsString(errorresponse)); - - throw new AAIServiceException(responseCode, errorresponse); - } - } catch(AAIServiceException aaiexc) { - throw aaiexc; - } catch (Exception exc) { - LOG.warn("updateAnAIEntry", exc); - throw new AAIServiceException(exc); - } finally { - try { - if(inputStream != null) - inputStream.close(); - } catch (Exception exc) { - - } - } - } @Override public AAIRequestExecutor getExecutor() { @@ -3210,6 +2402,8 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe try { HttpURLConnection con = getConfiguredConnection(httpReqUrl, HttpMethod.DELETE); +// SSLSocketFactory sockFact = CTX.getSocketFactory(); +// con.setSSLSocketFactory( sockFact ); OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); osw.write(json_text); osw.flush(); @@ -3269,16 +2463,17 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe return response; } - public ObjectMapper getObjectMapper() { + public static ObjectMapper getObjectMapper() { ObjectMapper mapper = new ObjectMapper(); AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(TypeFactory.defaultInstance()); AnnotationIntrospector secondary = new JacksonAnnotationIntrospector(); mapper.setAnnotationIntrospector(AnnotationIntrospector.pair(introspector, secondary)); mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + mapper.setSerializationInclusion(Include.NON_NULL); return mapper; } - public void logMetricRequest(String targetServiceName, String msg){ + public void logMetricRequest(String requestId, String targetServiceName, String msg, String path){ String svcInstanceId = ""; String svcName = null; String partnerName = null; @@ -3287,15 +2482,154 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe targetServiceName = ""; - ml.logRequest(svcInstanceId, svcName, partnerName, targetEntity, targetServiceName, targetVirtualEntity, msg); +// ml.logRequest(svcInstanceId, svcName, partnerName, targetEntity, targetServiceName, targetVirtualEntity, msg); } - public void logMetricResponse(int responseCode, String responseDescription){ - ml.logResponse(responseCode < 400 ? "SUCCESS" : "FAILURE", Integer.toBinaryString(responseCode), responseDescription); + public void logMetricResponse(String requestId, int responseCode, String responseDescription){ +// ml.logResponse(responseCode < 400 ? "SUCCESS" : "FAILURE", Integer.toBinaryString(responseCode), responseDescription); } public void logKeyError(String keys){ LOG.error("Atleast one of the keys [" + keys + "] should have been populated. This will cause a NPE."); } + + /** + * Retrofit code + */ + @Override + public QueryStatus save(String resource, boolean force, boolean localOnly, String key, Map<String, String> params, String prefix, SvcLogicContext ctx) + throws SvcLogicException { + + switch(resource){ + case "generic-query": + case "named-query": + case "nodes-query": + case "linterface": + case "l2-bridge-sbg": + case "l2-bridge-bgf": + case "echo": + case "test": + break; + + default: + if(key.contains(String.format("%s.", resource))) { + key = rewriteKey(resource, key, ctx); + } + } + return super.save(resource, force, localOnly, key, params, prefix, ctx); + } + + @Override + public QueryStatus query(String resource, boolean localOnly, String select, String key, String prefix, String orderBy, SvcLogicContext ctx) + throws SvcLogicException { + + switch(resource){ + case "generic-query": + case "named-query": + case "nodes-query": + case "linterface": + case "l2-bridge-sbg": + case "l2-bridge-bgf": + case "echo": + case "test": + break; + + default: + if(!key.contains(String.format("%s.", resource))) { + key = rewriteKey(resource, key, ctx); + } + } + + return super.query(resource, localOnly, select, key, prefix, orderBy, ctx); + } + + @Override + public QueryStatus delete(String resource, String key, SvcLogicContext ctx) throws SvcLogicException { + switch(resource){ + case "generic-query": + case "named-query": + case "nodes-query": + case "linterface": + case "l2-bridge-sbg": + case "l2-bridge-bgf": + case "echo": + case "test": + break; + + default: + if(key.contains(String.format("%s.", resource))) { + key = rewriteKey(resource, key, ctx); + } + } + + return super.delete(resource, key, ctx); + } + + @Override + public QueryStatus update(String resource, String key, Map<String, String> params, String prefix, SvcLogicContext ctx) throws SvcLogicException { + switch(resource){ + case "generic-query": + case "named-query": + case "nodes-query": + case "linterface": + case "l2-bridge-sbg": + case "l2-bridge-bgf": + case "echo": + case "test": + break; + + default: + if(key.contains(String.format("%s.", resource))) { + key = rewriteKey(resource, key, ctx); + } + } + + return super.update(resource, key, params, prefix, ctx); + } + + private String rewriteKey(String resource, String key, SvcLogicContext ctx) { + + Class<? extends AAIDatum> clazz = null; + try { + clazz = AAIRequest.getClassFromResource(resource) ; + } catch (ClassNotFoundException e) { + LOG.warn("AAIRequest does not support class: " + e.getMessage()); + return key; + } + if(clazz == null) + return key; + + List<String> fieldAnnotatedNames = new LinkedList<String>(); + + Field[] fields = clazz.getDeclaredFields(); + for(Field field : fields) { + String fieldName = field.getName(); + XmlElement annotation = field.getAnnotation(XmlElement.class); + if(annotation == null) + continue; + String primaryId = annotation.name(); + if("##default".equals(primaryId)) { + primaryId = fieldName; + } + fieldAnnotatedNames.add(primaryId); + } + + HashMap<String, String> nameValues = keyToHashMap(key, ctx); + Set<String> keyset = nameValues.keySet(); + for(String keyName : keyset) { + if(keyName.contains(".")) + continue; + else { + String tmpKeyName = keyName.replaceAll("_", "-"); + if(fieldAnnotatedNames.contains(tmpKeyName)) { + key = key.replace(tmpKeyName, String.format("%s.%s", resource, tmpKeyName)); + } + } + } + + + return key; + } + } diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java index 857a6ea..261a0c7 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceActivator.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceException.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceException.java index e5ae735..c829da5 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceException.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAIServiceException.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAITrinityService.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAITrinityService.java index e882b5d..e3f49ee 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAITrinityService.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/AAITrinityService.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java index ff94174..9897fbf 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CloudRegionRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CustomerRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CustomerRequest.java deleted file mode 100644 index ba83255..0000000 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/CustomerRequest.java +++ /dev/null @@ -1,126 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Properties; - -import org.openecomp.sdnc.sli.aai.data.AAIDatum; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.openecomp.aai.inventory.v8.Customer; - -public class CustomerRequest extends AAIRequest { - - // tenant (1602) - public static final String CUSTOMER_PATH = "org.openecomp.sdnc.sli.aai.path.customer"; - public static final String CUSTOMER_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.customer.query"; - - private final String customer_path; - private final String customer_query_path; - - public static final String CUSTOMER_GLOBAL_CUSTOMER_ID = "customer.global-customer-id"; - - - public CustomerRequest() { - customer_path = configProperties.getProperty(CUSTOMER_PATH); - customer_query_path = configProperties.getProperty(CUSTOMER_QUERY_PATH); - } - - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = target_uri + customer_path; - String encoded_vnf = null; - - String hostname = null; - - if(requestProperties.containsKey(CUSTOMER_GLOBAL_CUSTOMER_ID)) { - hostname = requestProperties.getProperty(CUSTOMER_GLOBAL_CUSTOMER_ID); - encoded_vnf = encodeQuery(hostname); - request_url = request_url.replace("{customer-id}", encoded_vnf) ; - } else { - LOG.error("Required key "+CUSTOMER_GLOBAL_CUSTOMER_ID+" is misssing."); - } - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("global-customer-id", hostname); - - return http_req_url; - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - return this.getRequestUrl(method, null); - } - - public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException { - - String key = CUSTOMER_GLOBAL_CUSTOMER_ID; - - if(!requestProperties.containsKey(key)) { - aaiService.logKeyError(CUSTOMER_GLOBAL_CUSTOMER_ID); - } - - - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{global-customer-id}", encoded_vnf) ; - aaiService.LOGwriteDateTrace("global-customer-id", requestProperties.getProperty(key)); - - return request_url; - } - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - Customer vnfc = (Customer)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(vnfc); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - @Override - public String[] getArgsList() { - String[] args = {CUSTOMER_GLOBAL_CUSTOMER_ID}; - return args; - } - - @Override - public Class<? extends AAIDatum> getModelClass() { - return Customer.class; - } -} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/EchoRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/EchoRequest.java index 995a7da..ee41e98 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/EchoRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/EchoRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GVnfLInterfaceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GVnfLInterfaceRequest.java deleted file mode 100644 index 17a9df2..0000000 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GVnfLInterfaceRequest.java +++ /dev/null @@ -1,137 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; - -import org.openecomp.sdnc.sli.aai.data.AAIDatum; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.openecomp.aai.inventory.v8.LInterface; - -public class GVnfLInterfaceRequest extends AAIRequest { - - private final String generic_vnf_linterface_path; - private final String generic_vnf_linterface_query_path; - - - public static final String INTERFACE_NAME = "interface-name"; - public static final String LINTERFACE_INTERFACE_NAME = "l-interface.interface-name"; - - - public GVnfLInterfaceRequest() - { - - String tmpGenericVnfLinterfacePath = configProperties.getProperty(GenericVnfRequest.GENERIC_VNF_PATH); - - generic_vnf_linterface_query_path = configProperties.getProperty(GenericVnfRequest.GENERIC_VNF_QUERY_PATH); - - if(tmpGenericVnfLinterfacePath != null) { - tmpGenericVnfLinterfacePath = tmpGenericVnfLinterfacePath + "/l-interfaces/l-interface/{interface-name}"; - LOG.debug("GVnfLInterfaceRequest.PATH = " + tmpGenericVnfLinterfacePath); - } else { - LOG.warn("PATH " + GenericVnfRequest.GENERIC_VNF_PATH + " not defined"); - } - - generic_vnf_linterface_path = tmpGenericVnfLinterfacePath; - } - - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = null; - - - request_url = target_uri + generic_vnf_linterface_path; - - String vnfId = requestProperties.getProperty(GenericVnfRequest.VNF_ID); - if(vnfId == null) { - vnfId = requestProperties.getProperty(GenericVnfRequest.GENERIC_VNF_ID); - } - - String encoded_vnf = encodeQuery(vnfId); - request_url = request_url.replace("{vnf-id}", encoded_vnf); - - String interfaceName = requestProperties.getProperty(INTERFACE_NAME); - if(interfaceName == null || interfaceName.isEmpty()) { - interfaceName = requestProperties.getProperty(LINTERFACE_INTERFACE_NAME); - } - encoded_vnf = encodeQuery(interfaceName); - request_url = request_url.replace("{interface-name}", encoded_vnf) ; - - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("vnf-id", vnfId); - aaiService.LOGwriteDateTrace("interface-name", interfaceName); - - return http_req_url; - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - return this.getRequestUrl(method, null); - } - - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - LInterface vnfc = (LInterface)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(vnfc); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - - @Override - public String[] getArgsList() { - String[] args = {INTERFACE_NAME, LINTERFACE_INTERFACE_NAME, GenericVnfRequest.VNF_ID, GenericVnfRequest.GENERIC_VNF_ID}; - return args; - } - - @Override - public Class<? extends AAIDatum> getModelClass() { - return LInterface.class; - } - - @Override - public String getPrimaryResourceName(String resource) { - return "l-interface"; - } - - -} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenVnfrVLanRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenVnfrVLanRequest.java deleted file mode 100644 index 0e34e31..0000000 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenVnfrVLanRequest.java +++ /dev/null @@ -1,132 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; - -import org.openecomp.sdnc.sli.aai.data.AAIDatum; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.openecomp.aai.inventory.v8.Vlan; - -public class GenVnfrVLanRequest extends AAIRequest { - //aai/v7/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface} - - // tenant (1602) - public static final String VLAN_PATH = "org.openecomp.sdnc.sli.aai.path.generic.vnf"; - public static final String VLAN_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.generic.vnf.query"; - - private final String vlan_path; - private final String vlan_query_path; - - public static final String VNF_ID = "generic_vnf.vnf_id"; - public static final String INTERFACE_NAME = "l_interface.interface_name"; - public static final String VLAN_INTERFACE = "vlan.vlan_interface"; - - public GenVnfrVLanRequest() { - vlan_path = configProperties.getProperty(VLAN_PATH) + "/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}"; - vlan_query_path = configProperties.getProperty(VLAN_QUERY_PATH); - } - - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = target_uri+vlan_path; - String encoded_vnf = encodeQuery(requestProperties.getProperty(VNF_ID)); - request_url = request_url.replace("{vnf-id}", encoded_vnf) ; - - encoded_vnf = encodeQuery(requestProperties.getProperty(INTERFACE_NAME)); - request_url = request_url.replace("{interface-name}", encoded_vnf) ; - - encoded_vnf = encodeQuery(requestProperties.getProperty(VLAN_INTERFACE)); - request_url = request_url.replace("{vlan-interface}", encoded_vnf) ; - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("vnf-id", requestProperties.getProperty(VNF_ID)); - aaiService.LOGwriteDateTrace("interface-name", requestProperties.getProperty(INTERFACE_NAME)); - aaiService.LOGwriteDateTrace("vlan-interface", requestProperties.getProperty(VLAN_INTERFACE)); - - return http_req_url; - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = target_uri+vlan_path; - String encoded_vnf = encodeQuery(requestProperties.getProperty(VNF_ID)); - request_url = request_url.replace("{vnf-id}", encoded_vnf) ; - - encoded_vnf = encodeQuery(requestProperties.getProperty(INTERFACE_NAME)); - request_url = request_url.replace("{interface-name}", encoded_vnf) ; - - encoded_vnf = encodeQuery(requestProperties.getProperty(VLAN_INTERFACE)); - request_url = request_url.replace("{vlan-interface}", encoded_vnf) ; - - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - - aaiService.LOGwriteDateTrace("vnf-id", requestProperties.getProperty(VNF_ID)); - aaiService.LOGwriteDateTrace("interface-name", requestProperties.getProperty(INTERFACE_NAME)); - aaiService.LOGwriteDateTrace("vlan-interface", requestProperties.getProperty(VLAN_INTERFACE)); - - return http_req_url; - } - - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - Vlan tenant = (Vlan)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(tenant); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - - @Override - public String[] getArgsList() { - String[] args = {VNF_ID, INTERFACE_NAME, VLAN_INTERFACE}; - return args; - } - - - @Override - public Class<? extends AAIDatum> getModelClass() { - return Vlan.class; - } -} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java index 83b5a51..417202e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericQueryRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java new file mode 100644 index 0000000..41ee9f3 --- /dev/null +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericRequest.java @@ -0,0 +1,320 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; + +import java.io.UnsupportedEncodingException; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.xml.bind.annotation.XmlElement; + +import org.openecomp.sdnc.sli.aai.data.AAIDatum; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Joiner; + +import org.openecomp.aai.inventory.v8.L3Network; +import org.openecomp.aai.inventory.v8.L3Networks; + +public class GenericRequest extends AAIRequest { + + + protected Class<? extends AAIDatum> model; + + public GenericRequest(Class<? extends AAIDatum> clazz) { + model = clazz; + } + + @Override + public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { + + String request_url = null; + String originalPath = null; + String pathSubstitute = null; + + request_url = target_uri + getRequestPath(); + + Map<String, String> queryParams = new HashMap<String, String> (); + if(resourceVersion != null) { + queryParams.put("resource-version",resourceVersion); + } + + Set<String> uniqueResources = extractUniqueResourceSetFromKeys(requestProperties.stringPropertyNames()); + + String[] keys = requestProperties.keySet().toArray(new String[0]); + for(String key : keys) { + if("cloud-region.cloud-region-id".equals(key)) + continue; + if("entitlement.resource-uuid".equals(key)) + continue; + if("license.resource-uuid".equals(key)) + continue; + + + String value = requestProperties.getProperty(key); + if(key.contains(".")) { + String[] splitKey = key.split("\\."); + if("cloud-region".equals(splitKey[0])){ + String cloudRegionId = requestProperties.getProperty("cloud-region.cloud-region-id"); + aaiService.LOGwriteDateTrace("cloud-region-id", cloudRegionId); + String token = String.format("%s/{%s}/{cloud-region-id}", splitKey[0], splitKey[1] ); + String encoded_owner = encodeQuery(value); + String encoded_region = encodeQuery(cloudRegionId); + request_url = request_url.replace(token, String.format("%s/%s/%s", splitKey[0], encoded_owner, encoded_region)); + } else if("entitlement".equals(splitKey[0])){ + String cloudRegionId = requestProperties.getProperty("entitlement.resource-uuid"); + aaiService.LOGwriteDateTrace("resource-uuid", cloudRegionId); + String token = String.format("%s/{%s}/{resource-uuid}", splitKey[0], splitKey[1] ); + String encoded_owner = encodeQuery(value); + String encoded_region = encodeQuery(cloudRegionId); + request_url = request_url.replace(token, String.format("%s/%s/%s", splitKey[0], encoded_owner, encoded_region)); + } else if("license".equals(splitKey[0])){ + String cloudRegionId = requestProperties.getProperty("license.resource-uuid"); + aaiService.LOGwriteDateTrace("resource-uuid", cloudRegionId); + String token = String.format("%s/{%s}/{resource-uuid}", splitKey[0], splitKey[1] ); + String encoded_owner = encodeQuery(value); + String encoded_region = encodeQuery(cloudRegionId); + request_url = request_url.replace(token, String.format("%s/%s/%s", splitKey[0], encoded_owner, encoded_region)); + } else { + Class<? extends AAIDatum> clazz = null; + try { + clazz = getClassFromResource(splitKey[0]); + } catch (ClassNotFoundException exc) { + LOG.warn("AAIRequest does not support class: " + exc.getMessage()); + return null; + } + + if(clazz != null) { + if(clazz == this.model) { + Field[] fields = this.model.getDeclaredFields(); + Field field = fields[0]; + String fieldName = field.getName(); + XmlElement annotation = field.getAnnotation(XmlElement.class); + String primaryId = annotation.name(); + if("##default".equals(primaryId)) { + primaryId = fieldName; + } + + String token = String.format("%s/{%s}", splitKey[0], primaryId); + + if(splitKey[1].equals(primaryId)) { + String encoded_vnf = encodeQuery(value); + request_url = request_url.replace(token, String.format("%s/%s", splitKey[0], encoded_vnf)); + } else { + queryParams.put(splitKey[1], encodeQuery(value)); + originalPath = token; + pathSubstitute = String.format("%s", splitKey[0]); + } + } else if(L3Networks.class == this.model) { + Field[] fields = L3Network.class.getDeclaredFields(); + Field field = fields[0]; + String fieldName = field.getName(); + XmlElement annotation = field.getAnnotation(XmlElement.class); + String primaryId = annotation.name(); + if("##default".equals(primaryId)) { + primaryId = fieldName; + } + + String token = String.format("%s/{%s}", splitKey[0], primaryId); + originalPath = token; + pathSubstitute = String.format(""); + + queryParams.put(splitKey[1], encodeQuery(value)); + } else { + String token = String.format("%s/{%s}", splitKey[0], splitKey[1]); + String encoded_vnf = encodeQuery(value); + request_url = request_url.replace(token, String.format("%s/%s", splitKey[0], encoded_vnf)); + } + } + + } + aaiService.LOGwriteDateTrace(splitKey[1], value); + } + } + + if(originalPath != null && pathSubstitute != null) + request_url = request_url.replace(originalPath, pathSubstitute); + + if(!queryParams.isEmpty()) { + Joiner.MapJoiner mapJoiner = Joiner.on("&").withKeyValueSeparator("="); + String queryString = mapJoiner.join(queryParams); + request_url = String.format("%s?%s", request_url, queryString); + } + + URL http_req_url = new URL(request_url); + + aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); + + + return http_req_url; + } + + + public URL OriginalgetRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { + + String request_url = null; + + request_url = target_uri + getRequestPath(); + + Map<String, String> keyValuepairs = new HashMap<String, String> (); + Set<String> uniqueResources = extractUniqueResourceSetFromKeys(requestProperties.stringPropertyNames()); + + String[] keys = requestProperties.keySet().toArray(new String[0]); + for(String key : keys) { + if("cloud-region.cloud-region-id".equals(key)) + continue; + if("entitlement.resource-uuid".equals(key)) + continue; + if("license.resource-uuid".equals(key)) + continue; + + + String value = requestProperties.getProperty(key); + if(key.contains(".")) { + String[] splitKey = key.split("\\."); + if("cloud-region".equals(splitKey[0])){ + String cloudRegionId = requestProperties.getProperty("cloud-region.cloud-region-id"); + aaiService.LOGwriteDateTrace("cloud-region-id", cloudRegionId); + String token = String.format("%s/{%s}/{cloud-region-id}", splitKey[0], splitKey[1] ); + String encoded_owner = encodeQuery(value); + String encoded_region = encodeQuery(cloudRegionId); + request_url = request_url.replace(token, String.format("%s/%s/%s", splitKey[0], encoded_owner, encoded_region)); + } else if("entitlement".equals(splitKey[0])){ + String cloudRegionId = requestProperties.getProperty("entitlement.resource-uuid"); + aaiService.LOGwriteDateTrace("resource-uuid", cloudRegionId); + String token = String.format("%s/{%s}/{resource-uuid}", splitKey[0], splitKey[1] ); + String encoded_owner = encodeQuery(value); + String encoded_region = encodeQuery(cloudRegionId); + request_url = request_url.replace(token, String.format("%s/%s/%s", splitKey[0], encoded_owner, encoded_region)); + } else if("license".equals(splitKey[0])){ + String cloudRegionId = requestProperties.getProperty("license.resource-uuid"); + aaiService.LOGwriteDateTrace("resource-uuid", cloudRegionId); + String token = String.format("%s/{%s}/{resource-uuid}", splitKey[0], splitKey[1] ); + String encoded_owner = encodeQuery(value); + String encoded_region = encodeQuery(cloudRegionId); + request_url = request_url.replace(token, String.format("%s/%s/%s", splitKey[0], encoded_owner, encoded_region)); + } else { + Class<? extends AAIDatum> clazz = null; + try { + clazz = getClassFromResource(splitKey[0]); + } catch (ClassNotFoundException exc) { + LOG.warn("AAIRequest does not support class: " + exc.getMessage()); + return null; + } + + if(clazz != null) { + if(clazz == this.model) { + Field[] fields = this.model.getDeclaredFields(); + Field field = fields[0]; + String fieldName = field.getName(); + XmlElement annotation = field.getAnnotation(XmlElement.class); + String primaryId = annotation.name(); + if("##default".equals(primaryId)) { + primaryId = fieldName; + } + + String token = String.format("%s/{%s}", splitKey[0], primaryId); + + if(splitKey[1].equals(primaryId)) { + String encoded_vnf = encodeQuery(value); + request_url = request_url.replace(token, String.format("%s/%s", splitKey[0], encoded_vnf)); + } else { + String replacement = String.format("%s?%s=%s", splitKey[0], splitKey[1], encodeQuery(value)); + if(request_url.contains(token)) + request_url = request_url.replace(token, replacement); + } + } else { + String token = String.format("%s/{%s}", splitKey[0], splitKey[1]); + String encoded_vnf = encodeQuery(value); + request_url = request_url.replace(token, String.format("%s/%s", splitKey[0], encoded_vnf)); + } + } + + } + aaiService.LOGwriteDateTrace(splitKey[1], value); + } + } + + + if(resourceVersion != null) { + request_url = request_url +"?resource-version="+resourceVersion; + } + URL http_req_url = new URL(request_url); + + aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); + + + return http_req_url; + } + + @Override + public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { + return this.getRequestUrl(method, null); + } + + + @Override + public String toJSONString() { + ObjectMapper mapper = getObjectMapper(); + + String json_text = null; + try { + json_text = mapper.writeValueAsString(requestDatum); + } catch (JsonProcessingException exc) { + handleException(this, exc); + return null; + } + return json_text; + } + + @Override + public String[] getArgsList() { + String[] args = {}; + return args; + } + + @Override + public Class<? extends AAIDatum> getModelClass() { + return model; + } + + public void processRequestPathValues(Map<String, String> nameValues) { + // identify unique resources + Set<String> uniqueResources = AAIRequest.extractUniqueResourceSetFromKeys(nameValues.keySet()); + + String[] arguments = nameValues.keySet().toArray(new String[0]); + for(String name : arguments) { + String tmpName = name.replaceAll("-", "_"); + String value = nameValues.get(tmpName); + if(value != null && !value.isEmpty()) { + value = value.trim().replace("'", "").replace("$", "").replace("'", ""); + tmpName = name.replaceAll("_", "-"); + this.addRequestProperty(tmpName, value); + } + } + } +} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfLInterfaceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfLInterfaceRequest.java deleted file mode 100644 index efa9ff6..0000000 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfLInterfaceRequest.java +++ /dev/null @@ -1,125 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Properties; - -import org.openecomp.sdnc.sli.aai.data.AAIDatum; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.openecomp.aai.inventory.v8.LInterface; - -public class GenericVnfLInterfaceRequest extends AAIRequest { - - public static final String GENERIC_VNF_LINTERFACE_PATH = "org.openecomp.sdnc.sli.aai.path.generic.vnf.linterface"; - - private final String generic_vnf_linterface_path; - - - public static final String INTERFACE_NAME = "interface-name"; - public static final String LINTERFACE_INTERFACE_NAME = "l-interface.interface-name"; - - public GenericVnfLInterfaceRequest() { - generic_vnf_linterface_path = configProperties.getProperty(GENERIC_VNF_LINTERFACE_PATH); - } - - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = null; - - request_url = target_uri + generic_vnf_linterface_path; - - - request_url = processPathData(request_url, requestProperties); - request_url = GenericVnfRequest.processPathData(request_url, requestProperties); - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - - - return http_req_url; - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - return this.getRequestUrl(method, null); - } - - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - LInterface vnfc = (LInterface)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(vnfc); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - - @Override - public Class<? extends AAIDatum> getModelClass() { - return LInterface.class; - } - - @Override - public String getPrimaryResourceName(String resource) { - return "l-interface"; - } - - public static final String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException { - String interfaceName = requestProperties.getProperty(INTERFACE_NAME); - if(interfaceName == null || requestProperties.containsKey(LINTERFACE_INTERFACE_NAME)) { - interfaceName = requestProperties.getProperty(LINTERFACE_INTERFACE_NAME); - } - - if(interfaceName == null) { - aaiService.logKeyError(String.format("%s,%s", INTERFACE_NAME, LINTERFACE_INTERFACE_NAME)); - } - - request_url = request_url.replace("{interface-name}", encodeQuery(interfaceName)) ; - aaiService.LOGwriteDateTrace("interface-name", interfaceName); - return request_url; - } - - - @Override - public String[] getArgsList() { - String[] tmpArray = {INTERFACE_NAME, LINTERFACE_INTERFACE_NAME, GenericVnfRequest.GENERIC_VNF_ID, GenericVnfRequest.VNF_ID}; - return tmpArray; - } -} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java index 093ab80..235cecf 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/GenericVnfRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java index 014a8a2..d9b2a91 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv4AddressListRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java index 549cb93..da57abf 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3InterfaceIpv6AddressListRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3NetworkRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3NetworkRequest.java deleted file mode 100644 index 608646a..0000000 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/L3NetworkRequest.java +++ /dev/null @@ -1,130 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; - -import org.openecomp.sdnc.sli.aai.data.AAIDatum; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.openecomp.aai.inventory.v8.L3Network; - -public class L3NetworkRequest extends AAIRequest { - - public static final String L3_NETWORK_PATH = "org.openecomp.sdnc.sli.aai.path.l3.network"; - public static final String L3_NETWORK_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.l3network.query.name"; - - private final String l3_network_path; - private final String l3_network_query_path; - - public static final String NETWORK_ID = "l3-network.network-id"; - public static final String NETWORK_NAME = "l3-network.network-name"; - - - public L3NetworkRequest() { - l3_network_path = configProperties.getProperty(L3_NETWORK_PATH); - l3_network_query_path = configProperties.getProperty(L3_NETWORK_QUERY_PATH); - } - - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - if(requestProperties.containsKey(NETWORK_NAME)) { - return getRequestQueryUrl(method); - } - - String request_url = target_uri+l3_network_path; - - String encoded_vnf = null; - - if(requestProperties.containsKey(NETWORK_ID)) { - encoded_vnf = encodeQuery(requestProperties.getProperty(NETWORK_ID)); - request_url = request_url.replace("{network-id}", encoded_vnf) ; - - } - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace(NETWORK_ID, requestProperties.getProperty(NETWORK_ID)); - - return http_req_url; - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = target_uri+l3_network_query_path; - - String encoded_vnf = null; - - if(requestProperties.containsKey(NETWORK_NAME)) { - encoded_vnf = encodeQuery(requestProperties.getProperty(NETWORK_NAME)); - request_url = request_url.replace("{network-name}", encoded_vnf) ; - - } - - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace(NETWORK_NAME, requestProperties.getProperty(NETWORK_NAME)); - - return http_req_url; - } - - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - L3Network l3Network = (L3Network)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(l3Network); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - @Override - public String[] getArgsList() { - String[] args = {NETWORK_ID, NETWORK_NAME}; - return args; - } - - @Override - public Class<? extends AAIDatum> getModelClass() { - return L3Network.class; - } - - public String getPrimaryResourceName(String resource) { - return "l3-network"; - } -} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java index 2923667..7ba0155 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LInterfaceRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java index 8dbbd4f..15b72f1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LagInterfacePnfRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LogicalLinkRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LogicalLinkRequest.java deleted file mode 100644 index 66c80b0..0000000 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/LogicalLinkRequest.java +++ /dev/null @@ -1,110 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; - -import org.openecomp.sdnc.sli.aai.data.AAIDatum; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.openecomp.aai.inventory.v8.LogicalLink; - -public class LogicalLinkRequest extends AAIRequest { - - // tenant (1602) - public static final String LOGICAL_LINK_PATH = "org.openecomp.sdnc.sli.aai.path.logical.link"; - public static final String LOGICAL_LINK_QUERY_PATH = "org.openecomp.sdnc.sli.aai.path.logical.link.query"; - - private final String logical_link_path; - private final String logical_link_query_path; - - public static final String LIK_NAME = "link-name"; - public static final String LOGICAL_LIK_NAME = "logical-link.link-name"; - - public LogicalLinkRequest() { - logical_link_path = configProperties.getProperty(LOGICAL_LINK_PATH); - logical_link_query_path = configProperties.getProperty(LOGICAL_LINK_QUERY_PATH); - } - - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = target_uri + logical_link_path; - String encoded_vnf = null; - - String linkNameKey = LIK_NAME; - if(requestProperties.containsKey(LOGICAL_LIK_NAME)) { - linkNameKey = LOGICAL_LIK_NAME; - } - - encoded_vnf = encodeQuery(requestProperties.getProperty(linkNameKey)); - request_url = request_url.replace("{link-name}", encoded_vnf) ; - - - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("link-name", requestProperties.getProperty(linkNameKey)); - - return http_req_url; - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - return this.getRequestUrl(method, null); - } - - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - LogicalLink vnfc = (LogicalLink)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(vnfc); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - @Override - public String[] getArgsList() { - String[] args = {LIK_NAME, LOGICAL_LIK_NAME}; - return args; - } - - @Override - public Class<? extends AAIDatum> getModelClass() { - return LogicalLink.class; - } -} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java index 5fa1270..6271b1d 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NamedQueryRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java index bc1dccb..d9bee38 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/NodesQueryRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java index 91f6569..637a0e4 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfacePnfRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java index 33d6b3b..f56d586 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PInterfaceRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PServerRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PServerRequest.java index 09674b8..d78254b 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PServerRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PServerRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PathRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PathRequest.java index e46f005..7519133 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PathRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PathRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java index 055da4a..7aa0f1b 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PhysicalLinkRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PnfRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PnfRequest.java index e668a27..83988f9 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PnfRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/PnfRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java index 06ab78f..b964ecb 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/RelationshipRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java index d8c36f3..0f0059a 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SelfLinkRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceInstanceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceInstanceRequest.java deleted file mode 100644 index e03fc98..0000000 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceInstanceRequest.java +++ /dev/null @@ -1,120 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Properties; - -import org.openecomp.sdnc.sli.aai.data.AAIDatum; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.openecomp.aai.inventory.v8.ServiceInstance; - -public class ServiceInstanceRequest extends AAIRequest { - - // tenant (1602) - public static final String REQUEST_PATH = "org.openecomp.sdnc.sli.aai.path.service.instance"; - public static final String QUERY_REQUEST_PATH = "org.openecomp.sdnc.sli.aai.path.service.instance.query"; - - private final String request_path; - private final String query_request_path; - - public static final String SERVICE_INSTANCE_ID = "service-instance.service-instance-id"; - - - - public ServiceInstanceRequest() { - request_path = configProperties.getProperty(REQUEST_PATH); - query_request_path = configProperties.getProperty(QUERY_REQUEST_PATH); - } - - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = target_uri + request_path; - String encoded_vnf = null; - - request_url = processPathData(request_url, requestProperties); - request_url = ServiceSubscriptionRequest.processPathData(request_url, requestProperties); - request_url = CustomerRequest.processPathData(request_url, requestProperties); - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - - return http_req_url; - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - return this.getRequestUrl(method, null); - } - - - public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException { - - String key = SERVICE_INSTANCE_ID; - - if(!requestProperties.containsKey(key)) { - aaiService.logKeyError(SERVICE_INSTANCE_ID); - } - - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{service-instance-id}", encoded_vnf) ; - aaiService.LOGwriteDateTrace("service-instance-id", requestProperties.getProperty(key)); - - return request_url; - } - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - ServiceInstance vnfc = (ServiceInstance)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(vnfc); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - @Override - public String[] getArgsList() { - String[] args = {SERVICE_INSTANCE_ID, ServiceSubscriptionRequest.SERVICE_TYPE, CustomerRequest.CUSTOMER_GLOBAL_CUSTOMER_ID}; - return args; - } - - @Override - public Class<? extends AAIDatum> getModelClass() { - return ServiceInstance.class; - } -} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceRequest.java index 8ddbaef..7266fd0 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceSubscriptionRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceSubscriptionRequest.java deleted file mode 100644 index 74a0340..0000000 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/ServiceSubscriptionRequest.java +++ /dev/null @@ -1,120 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Properties; - -import org.openecomp.sdnc.sli.aai.data.AAIDatum; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.openecomp.aai.inventory.v8.ServiceSubscription; - -public class ServiceSubscriptionRequest extends AAIRequest { - - // tenant (1602) - public static final String REQUEST_PATH = "org.openecomp.sdnc.sli.aai.path.service.subscription"; - public static final String QUERY_REQUEST_PATH = "org.openecomp.sdnc.sli.aai.path.service.subscription.query"; - - private final String request_path; - private final String query_request_path; - - public static final String SERVICE_TYPE = "service-subscription.service-type"; - - - - public ServiceSubscriptionRequest() { - request_path = configProperties.getProperty(REQUEST_PATH); - query_request_path = configProperties.getProperty(QUERY_REQUEST_PATH); - } - - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = target_uri + request_path; - String encoded_vnf = null; - - request_url = processPathData(request_url, requestProperties); - request_url = CustomerRequest.processPathData(request_url, requestProperties); - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); -// aaiService.LOGwriteDateTrace("service-type", serviceId); - - return http_req_url; - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - return this.getRequestUrl(method, null); - } - - - public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException { - - String key = SERVICE_TYPE; - - if(!requestProperties.containsKey(key)) { - aaiService.logKeyError(SERVICE_TYPE); - } - - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{service-type}", encoded_vnf) ; - aaiService.LOGwriteDateTrace("service-type", requestProperties.getProperty(key)); - - return request_url; - } - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - ServiceSubscription vnfc = (ServiceSubscription)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(vnfc); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - @Override - public String[] getArgsList() { - String[] args = {SERVICE_TYPE, CustomerRequest.CUSTOMER_GLOBAL_CUSTOMER_ID}; - return args; - } - - @Override - public Class<? extends AAIDatum> getModelClass() { - return ServiceSubscription.class; - } -} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java index 67bb96f..8c97b3e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubInterfaceRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubnetRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubnetRequest.java index ccaf25f..05d93e8 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubnetRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/SubnetRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/TenantRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/TenantRequest.java index 3b94adb..2a4e1a1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/TenantRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/TenantRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VfModuleRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/UpdateRequest.java index 64d65ef..4015cd0 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VfModuleRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/UpdateRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,93 +24,82 @@ package org.openecomp.sdnc.sli.aai; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; +import java.util.Map; import java.util.Properties; import org.openecomp.sdnc.sli.aai.data.AAIDatum; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.openecomp.aai.inventory.v8.VfModule; - -public class VfModuleRequest extends AAIRequest { - - // tenant (1602) - public static final String GENERIC_VNF_PATH = "org.openecomp.sdnc.sli.aai.path.vf.module"; - - private final String vf_module_path; +public class UpdateRequest extends AAIRequest { - public static final String VF_MODULE_ID = "vf-module.vf-module-id"; + private AAIRequest request; + private Map<String, String> params; - - public VfModuleRequest() { - vf_module_path = configProperties.getProperty(GENERIC_VNF_PATH); + public UpdateRequest(AAIRequest request, Map<String, String> parms) { + this.request = request; + this.params = parms; } - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = target_uri+vf_module_path; - String key = VF_MODULE_ID; - - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{vf-module-id}", encoded_vnf) ; - - request_url = GenericVnfRequest.processPathData(request_url, requestProperties); - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("vf-module-id", requestProperties.getProperty(key)); - - return http_req_url; + public URL getRequestUrl(String method, String resourceVersion) + throws UnsupportedEncodingException, MalformedURLException { + return request.getRequestUrl(method, resourceVersion); } - + @Override public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - return getRequestUrl(method, null); + return request.getRequestQueryUrl(method); } - @Override public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - VfModule tenant = (VfModule)requestDatum; - String json_text = null; + ObjectMapper mapper = AAIService.getObjectMapper(); + String json = null; + try { - json_text = mapper.writeValueAsString(tenant); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; + json = mapper.writeValueAsString(params); + } catch (JsonProcessingException e) { + LOG.error("Could not convert parameters of " + request.getRequestObject().getClass().getName(), e); } - return json_text; + + return json; } - @Override public String[] getArgsList() { - String[] args = {VF_MODULE_ID, GenericVnfRequest.GENERIC_VNF_ID, GenericVnfRequest.VNF_ID}; - return args; + return request.getArgsList(); } - @Override public Class<? extends AAIDatum> getModelClass() { - return VfModule.class; + return request.getModelClass(); + } + + @Override + public void addRequestProperty(String key, String value) { + request.requestProperties.put(key, value); } - public static String processPathData(String request_url, Properties requestProperties) throws UnsupportedEncodingException { - - String key = VF_MODULE_ID; - - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{vf-module-id}", encoded_vnf) ; - - return request_url; + +// if(request != null) { +// Class<?> clazz = request.getClass(); +// Method function = null; +// try { +// function = clazz.getMethod("processPathData", request_url.getClass(), requestProperties.getClass()); +// request_url = (String) function.invoke(null, request_url, requestProperties); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } + +// request.processPathData(request_url, requestProperties); + return request_url; + } + + public void processRequestPathValues(Map<String, String> nameValues) { + request.processRequestPathValues(nameValues); } + } diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VLanRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VLanRequest.java index a24517b..2a775f4 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VLanRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VLanRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VServerVLanRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VServerVLanRequest.java index 28b5542..f653d71 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VServerVLanRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VServerVLanRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.openecomp.aai.inventory.v8.Vlan; public class VServerVLanRequest extends AAIRequest { - //aai/v7/cloud-infrastructure/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface} // tenant (1602) public static final String VLAN_PATH = "org.openecomp.sdnc.sli.aai.path.vlan"; diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VnfcRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VnfcRequest.java deleted file mode 100644 index e45e78d..0000000 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VnfcRequest.java +++ /dev/null @@ -1,107 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; - -import org.openecomp.sdnc.sli.aai.data.AAIDatum; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.openecomp.aai.inventory.v8.Vnfc; - -public class VnfcRequest extends AAIRequest { - - // vnfc - public static final String VNFC_PATH = "org.openecomp.sdnc.sli.aai.path.vnfc"; - - - private final String vnfc_path; - - - public static final String VNFC_NAME = "vnfc-name"; - public static final String VNFC_VNFC_NAME = "vnfc.vnfc-name"; - - - public VnfcRequest() { - vnfc_path = configProperties.getProperty(VNFC_PATH); - - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - return this.getRequestUrl(method, null); - } - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = target_uri+vnfc_path; - - String key = VNFC_NAME; - if(requestProperties.containsKey(VNFC_VNFC_NAME)) { - key = VNFC_VNFC_NAME; - } - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{vnfc-name}", encoded_vnf) ; - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("vnfc-name", requestProperties.getProperty(key)); - - return http_req_url; - } - - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - Vnfc vnfc = (Vnfc)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(vnfc); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - @Override - public String[] getArgsList() { - String[] args = {VNFC_NAME, VNFC_VNFC_NAME}; - - return args; - } - - @Override - public Class<? extends AAIDatum> getModelClass() { - return Vnfc.class; - } -} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VolumeGroupRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VolumeGroupRequest.java deleted file mode 100644 index 4437cb4..0000000 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VolumeGroupRequest.java +++ /dev/null @@ -1,106 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All 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.openecomp.sdnc.sli.aai; - -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; - -import org.openecomp.sdnc.sli.aai.data.AAIDatum; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.openecomp.aai.inventory.v8.Vnfc; - -public class VolumeGroupRequest extends AAIRequest { - - // volume-group-id - public static final String VOLUME_GROUP_PATH = "org.openecomp.sdnc.sli.aai.path.volume.group"; - - private final String volume_group_path; - - public static final String VOLUME_GROUP_NAME = "volume-group-id"; - public static final String VOLUME_GROUP_VOLUME_GROUP_NAME = "volume-group.volume-group-id"; - - - public VolumeGroupRequest() { - volume_group_path = configProperties.getProperty(VOLUME_GROUP_PATH); - } - - @Override - public URL getRequestQueryUrl(String method) throws UnsupportedEncodingException, MalformedURLException { - return this.getRequestUrl(method, null); - } - - @Override - public URL getRequestUrl(String method, String resourceVersion) throws UnsupportedEncodingException, MalformedURLException { - - String request_url = target_uri+volume_group_path; - - String key = VOLUME_GROUP_NAME; - if(requestProperties.containsKey(VOLUME_GROUP_VOLUME_GROUP_NAME)) { - key = VOLUME_GROUP_VOLUME_GROUP_NAME; - } - String encoded_vnf = encodeQuery(requestProperties.getProperty(key)); - request_url = request_url.replace("{volume-group-id}", encoded_vnf) ; - - request_url = CloudRegionRequest.processPathData(request_url, requestProperties); - - if(resourceVersion != null) { - request_url = request_url +"?resource-version="+resourceVersion; - } - URL http_req_url = new URL(request_url); - - aaiService.LOGwriteFirstTrace(method, http_req_url.toString()); - aaiService.LOGwriteDateTrace("volume-group-id", requestProperties.getProperty(key)); - - return http_req_url; - } - - - @Override - public String toJSONString() { - ObjectMapper mapper = getObjectMapper(); - Vnfc vnfc = (Vnfc)requestDatum; - String json_text = null; - try { - json_text = mapper.writeValueAsString(vnfc); - } catch (JsonProcessingException exc) { - handleException(this, exc); - return null; - } - return json_text; - } - - @Override - public String[] getArgsList() { - String[] args = {VOLUME_GROUP_NAME, VOLUME_GROUP_VOLUME_GROUP_NAME, CloudRegionRequest.CLOUD_REGION_CLOUD_OWNER, CloudRegionRequest.CLOUD_REGION_CLOUD_REGION_ID}; - - return args; - } - - @Override - public Class<? extends AAIDatum> getModelClass() { - return Vnfc.class; - } -} diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VserverRequest.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VserverRequest.java index d621ac5..757034c 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VserverRequest.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/VserverRequest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/AAIDatum.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/AAIDatum.java index b809d9e..508c30f 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/AAIDatum.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/AAIDatum.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/EchoResponse.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/EchoResponse.java index abbd44f..8be963d 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/EchoResponse.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/EchoResponse.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ErrorResponse.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ErrorResponse.java index 93d6604..6559be6 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ErrorResponse.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ErrorResponse.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/RequestError.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/RequestError.java index f434382..91ce7c3 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/RequestError.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/RequestError.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResourceVersion.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResourceVersion.java index b3de714..e74c538 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResourceVersion.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResourceVersion.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessage.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessage.java index 4836006..7c6da51 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessage.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessage.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessages.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessages.java index 96ce492..faba193 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessages.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ResponseMessages.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ServiceException.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ServiceException.java index 13b2970..4d4f843 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ServiceException.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/ServiceException.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java index 5df2892..03f638a 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/SubInterface.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ import org.openecomp.aai.inventory.v8.Vlans; "vlans", "relationshipList" }) -public class SubInterface implements AAIDatum, ResourceVersion { +public class SubInterface implements AAIDatum { @JsonProperty("interface-name") private String interfaceName; @@ -59,7 +59,7 @@ public class SubInterface implements AAIDatum, ResourceVersion { private Map<String, Object> additionalProperties = new HashMap<String, Object>(); /** - * + * * @return * The interfaceName */ @@ -69,7 +69,7 @@ public class SubInterface implements AAIDatum, ResourceVersion { } /** - * + * * @param interfaceName * The interface-name */ @@ -79,7 +79,7 @@ public class SubInterface implements AAIDatum, ResourceVersion { } /** - * + * * @return * The interfaceRole */ @@ -89,7 +89,7 @@ public class SubInterface implements AAIDatum, ResourceVersion { } /** - * + * * @param interfaceRole * The interface-role */ @@ -99,7 +99,7 @@ public class SubInterface implements AAIDatum, ResourceVersion { } /** - * + * * @return * The resourceVersion */ @@ -109,7 +109,7 @@ public class SubInterface implements AAIDatum, ResourceVersion { } /** - * + * * @param resourceVersion * The resource-version */ @@ -119,7 +119,7 @@ public class SubInterface implements AAIDatum, ResourceVersion { } /** - * + * * @return * The vlans */ @@ -129,7 +129,7 @@ public class SubInterface implements AAIDatum, ResourceVersion { } /** - * + * * @param vlans * The vlans */ @@ -139,7 +139,7 @@ public class SubInterface implements AAIDatum, ResourceVersion { } /** - * + * * @return * The relationshipList */ @@ -149,7 +149,7 @@ public class SubInterface implements AAIDatum, ResourceVersion { } /** - * + * * @param relationshipList * The relationshipList */ diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/Variables.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/Variables.java index e15b657..77aa91e 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/Variables.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/Variables.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/KeyDatum.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/KeyDatum.java index 8b26ad2..b88e82d 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/KeyDatum.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/KeyDatum.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/NotifyEvent.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/NotifyEvent.java index 0196a8d..832bd99 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/NotifyEvent.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/notify/NotifyEvent.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Flavor.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Flavor.java index 24d93de..610d32f 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Flavor.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Flavor.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Host.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Host.java index a4d43d4..ebca468 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Host.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Host.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Image.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Image.java index 2ffa32f..ff6d2a8 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Image.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Image.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/IpAddress.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/IpAddress.java index d4faca1..7157e13 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/IpAddress.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/IpAddress.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Relationship.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Relationship.java index cb65abf..f98be2f 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Relationship.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/Relationship.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipDatum.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipDatum.java index 800bb6a..6244d3a 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipDatum.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipDatum.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipList.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipList.java index be39145..c3911bb 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipList.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/RelationshipList.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/VServer.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/VServer.java index 84349af..a470240 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/VServer.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/data/v1507/VServer.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java index d602681..5e2eb78 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilter.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilters.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilters.java index f251492..b3b2af0 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilters.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/InstanceFilters.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQuery.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQuery.java index 8f927ac..db749c6 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQuery.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQuery.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java index 595422a..f136198 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/NamedQueryData.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/QueryParameters.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/QueryParameters.java index d2cdd26..76bcd4f 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/QueryParameters.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/query/QueryParameters.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Action.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Action.java index 7065448..28af6e2 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Action.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Action.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/ActionDatum.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/ActionDatum.java index 0da13c2..e0c80b8 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/ActionDatum.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/ActionDatum.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Update.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Update.java index dc61e8b..abc36f1 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Update.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/Update.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/UpdateNodeKey.java b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/UpdateNodeKey.java index 8060d67..c113a79 100644 --- a/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/UpdateNodeKey.java +++ b/aai-service/provider/src/main/java/org/openecomp/sdnc/sli/aai/update/UpdateNodeKey.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/aai-service/provider/src/test/java/org/openecomp/sdnc/sli/aai/r1607/R1607AutoGeneratedTest.java b/aai-service/provider/src/test/java/org/openecomp/sdnc/sli/aai/r1607/R1607AutoGeneratedTest.java index 1091b9f..d121c32 100644 --- a/aai-service/provider/src/test/java/org/openecomp/sdnc/sli/aai/r1607/R1607AutoGeneratedTest.java +++ b/aai-service/provider/src/test/java/org/openecomp/sdnc/sli/aai/r1607/R1607AutoGeneratedTest.java @@ -3,7 +3,7 @@ * openECOMP : SDN-C * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -463,7 +463,7 @@ public class R1607AutoGeneratedTest { fail("Test file does not exist"); } SvcLogicContext ctx = new SvcLogicContext(); - ObjectMapper mapper = client.getObjectMapper(); + ObjectMapper mapper = AAIService.getObjectMapper(); InventoryResponseItems request = mapper.readValue(requestFile, InventoryResponseItems.class); Map<String, Object> subnetsList = mapper.convertValue(request, Map.class); AAIDeclarations.class.cast(client).writeMap(subnetsList, "aaiTmp", ctx); diff --git a/aai-service/provider/src/test/resources/aaiclient.properties b/aai-service/provider/src/test/resources/aaiclient.properties index 0091812..52d0cb6 100644 --- a/aai-service/provider/src/test/resources/aaiclient.properties +++ b/aai-service/provider/src/test/resources/aaiclient.properties @@ -3,7 +3,7 @@ # openECOMP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |