diff options
| author |   Skip Wonnell <skip@att.com> | 2018-02-20 14:42:34 -0600 |
|---|---|---|
| committer |   Randa Maher <rx196w@att.com> | 2018-02-21 01:30:23 +0000 |
| commit | faae86dcfaab2d8ecc966540ab262bd10849fd01 (patch) | |
| tree | 59ea2d20fb9c0d0e51235527f60ee8c3695966e5 | |
| parent | 59891662bdf0b0bdfcd0f2a9fdf2bafb17547125 (diff) | |
Update license text part 3
Issue-ID: APPC-637
Change-Id: I361c457acd27099294365f8ee3aeb167cd7fcafd
Signed-off-by: Skip Wonnell <skip@att.com>
30 files changed, 712 insertions, 106 deletions
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/preferredRoute.txt b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/preferredRoute.txt index 662b0aa7d..7e6ed8bdf 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/preferredRoute.txt +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/src/main/resources/preferredRoute.txt @@ -1 +1,22 @@ -preferredRouteKey=MR1
\ No newline at end of file +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ +preferredRouteKey=MR1 diff --git a/appc-client/client-simulator/src/main/resources/run.bat b/appc-client/client-simulator/src/main/resources/run.bat index 0fb66f4cc..1caa19984 100644 --- a/appc-client/client-simulator/src/main/resources/run.bat +++ b/appc-client/client-simulator/src/main/resources/run.bat @@ -1,2 +1,24 @@ +rem ============LICENSE_START========================================== +rem ONAP : APPC +rem =================================================================== +rem Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +rem =================================================================== +rem +rem Unless otherwise specified, all software contained herein is licensed +rem under the Apache License, Version 2.0 (the License); +rem you may not use this software except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. +rem +rem ECOMP is a trademark and service mark of AT&T Intellectual Property. +rem ============LICENSE_END============================================ + java -jar client-simulator-1.4.07-SNAPSHOT-jar-with-dependencies.jar C:\test\1\ JSON pause diff --git a/appc-config/appc-config-params/provider/src/test/resources/parser/pd.yaml b/appc-config/appc-config-params/provider/src/test/resources/parser/pd.yaml index a06abfc94..b452ebe2c 100644 --- a/appc-config/appc-config-params/provider/src/test/resources/parser/pd.yaml +++ b/appc-config/appc-config-params/provider/src/test/resources/parser/pd.yaml @@ -1,3 +1,24 @@ +# ============LICENSE_START==========================================
+# ONAP : APPC
+# ===================================================================
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# ===================================================================
+#
+# Unless otherwise specified, all software contained herein is licensed
+# under the Apache License, Version 2.0 (the License);
+# you may not use this software 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.
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# ============LICENSE_END============================================
---
kind: "Property Definition"
version: "V1"
diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition.yml index fb1c06413..83c30c89d 100644 --- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition.yml +++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition.yml @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ --- kind: "Property Definition" version: "V1" @@ -68,4 +89,4 @@ vnf-parameter-list: rule-type: null default: "32" request-keys: null - response-keys: null
\ No newline at end of file + response-keys: null diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition2.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition2.yml index 4974dfecb..a7be7462b 100644 --- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition2.yml +++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition2.yml @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ --- kind: "Property Definition" version: "V1" @@ -68,4 +89,4 @@ vnf-parameter-list: rule-type: null default: "32" request-keys: null - response-keys: null
\ No newline at end of file + response-keys: null diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition3.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition3.yml index 4552dfece..f62a96ced 100644 --- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition3.yml +++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition3.yml @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ --- kind: "Property Definition" version: "V1" @@ -67,4 +88,4 @@ vnf-parameter-list: rule-type: null default: "32" request-keys: null - response-keys: null
\ No newline at end of file + response-keys: null diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition4.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition4.yml index e06b8cb71..8074ea529 100644 --- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition4.yml +++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition4.yml @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ --- kind: version: "V1" @@ -67,4 +88,4 @@ vnf-parameter-list: rule-type: null default: "32" request-keys: null - response-keys: null
\ No newline at end of file + response-keys: null diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExpectedTosca.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExpectedTosca.yml index 766d57083..fb26dd9b1 100644 --- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExpectedTosca.yml +++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExpectedTosca.yml @@ -50,4 +50,4 @@ topology_template: CORE_NETWORK_PLEN: <rule-type = > <response-keys = > <source-system = > <request-keys = > REMOTE_CORE_ALT_IP_ADDR: <rule-type = > <response-keys = > <source-system = > <request-keys = > REMOTE_ACCESS_IP_ADDR: <rule-type = > <response-keys = > <source-system = > <request-keys = > - REMOTE_BILLING_IP_ADDR: <rule-type = > <response-keys = > <source-system = source> <request-keys = >
\ No newline at end of file + REMOTE_BILLING_IP_ADDR: <rule-type = > <response-keys = > <source-system = source> <request-keys = > diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactNegetiveInputTosca.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactNegetiveInputTosca.yml index bfc6009d1..5ec6a6d0f 100644 --- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactNegetiveInputTosca.yml +++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactNegetiveInputTosca.yml @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ node_types: Property Definition: derived_from: org.openecomp.genericvnf @@ -22,4 +43,4 @@ topology_template: type: Property Definition properties: abc: <> source1 <reqk1:reqv1 , reqk2:reqv2> - param 2: <rule-type:rule 2> <> source2 <>
\ No newline at end of file + param 2: <rule-type:rule 2> <> source2 <> diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactPositiveInputTosca.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactPositiveInputTosca.yml index 5f5defa79..56b6203ec 100644 --- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactPositiveInputTosca.yml +++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactPositiveInputTosca.yml @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ node_types: Property Definition: derived_from: org.openecomp.genericvnf @@ -22,4 +43,4 @@ topology_template: type: Property Definition properties: abc: <rule-type = interface-ip-address> <response-keys = address-0:0:0:0:0=1n004v006:ipaddress-v4 > <source-system=source> <request-keys=address_fqdn:0:0:0:0:0 , address_type:v,4> - param 2: <rule-type = interface-ip-address> <response-keys = address-0:0:0:0:0:ipaddress-v4 > <source-system = source> <request-keys = address_fqdn:0:0:0:0:0 , address_type:v4>
\ No newline at end of file + param 2: <rule-type = interface-ip-address> <response-keys = address-0:0:0:0:0:ipaddress-v4 > <source-system = source> <request-keys = address_fqdn:0:0:0:0:0 , address_type:v4> diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/xsd/vf-license-model.xsd b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/xsd/vf-license-model.xsd index 9fb979609..8b12855e0 100644 --- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/xsd/vf-license-model.xsd +++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/xsd/vf-license-model.xsd @@ -1,88 +1,112 @@ -<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="vf-license-model"> - <xs:complexType> - <xs:sequence> - <xs:element type="xs:string" name="vnf-id"/> - <xs:element type="xs:string" name="vendor-name"/> - <xs:element name="feature-group-list"> - <xs:complexType> - <xs:sequence> - <xs:element name="feature-group"> - <xs:complexType> - <xs:sequence> - <xs:element type="xs:string" name="feature-group-uuid"/> - <xs:element type="xs:string" name="name"/> - <xs:element type="xs:string" name="description"/> - <xs:element type="xs:string" name="att-part-number"/> - <xs:element name="entitlement-pool-list"> - <xs:complexType> - <xs:sequence> - <xs:element name="entitlement-pool"> - <xs:complexType> - <xs:sequence> - <xs:element type="xs:string" name="entitlement-pool-uuid"/> - <xs:element type="xs:string" name="name"/> - <xs:element type="xs:string" name="description"/> - <xs:element type="xs:string" name="manufacturer-reference-number"/> - <xs:element name="threshold-value"> - <xs:complexType> - <xs:sequence> - <xs:element type="xs:byte" name="value"/> - <xs:element type="xs:string" name="unit"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="entitlement-metric"> - <xs:complexType> - <xs:sequence> - <xs:element type="xs:string" name="value"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element type="xs:string" name="increments"/> - <xs:element name="aggregation-function"> - <xs:complexType> - <xs:sequence> - <xs:element type="xs:string" name="value"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="time"> - <xs:complexType> - <xs:sequence> - <xs:element type="xs:string" name="value"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="license-key-group-list"> - <xs:complexType> - <xs:sequence> - <xs:element name="license-key-group"> - <xs:complexType> - <xs:sequence> - <xs:element type="xs:string" name="license-key-group-uuid"/> - <xs:element type="xs:string" name="name"/> - <xs:element type="xs:string" name="description"/> - <xs:element type="xs:string" name="type"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> -</xs:schema> +<!--
+============LICENSE_START==========================================
+ONAP : APPC
+===================================================================
+Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+===================================================================
+
+Unless otherwise specified, all software contained herein is licensed
+under the Apache License, Version 2.0 (the License);
+you may not use this software 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.
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+============LICENSE_END============================================
+-->
+
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="vf-license-model">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="vnf-id"/>
+ <xs:element type="xs:string" name="vendor-name"/>
+ <xs:element name="feature-group-list">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="feature-group">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="feature-group-uuid"/>
+ <xs:element type="xs:string" name="name"/>
+ <xs:element type="xs:string" name="description"/>
+ <xs:element type="xs:string" name="att-part-number"/>
+ <xs:element name="entitlement-pool-list">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="entitlement-pool">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="entitlement-pool-uuid"/>
+ <xs:element type="xs:string" name="name"/>
+ <xs:element type="xs:string" name="description"/>
+ <xs:element type="xs:string" name="manufacturer-reference-number"/>
+ <xs:element name="threshold-value">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:byte" name="value"/>
+ <xs:element type="xs:string" name="unit"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="entitlement-metric">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="value"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element type="xs:string" name="increments"/>
+ <xs:element name="aggregation-function">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="value"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="time">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="value"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="license-key-group-list">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="license-key-group">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="license-key-group-uuid"/>
+ <xs:element type="xs:string" name="name"/>
+ <xs:element type="xs:string" name="description"/>
+ <xs:element type="xs:string" name="type"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/etc/org.apache.cxf.osgi.cfg b/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/etc/org.apache.cxf.osgi.cfg index 7ea1088a7..c0a86c1e5 100644 --- a/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/etc/org.apache.cxf.osgi.cfg +++ b/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/etc/org.apache.cxf.osgi.cfg @@ -1 +1,22 @@ -org.apache.cxf.servlet.context=/actions
\ No newline at end of file +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ +org.apache.cxf.servlet.context=/actions diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/dg_activate.txt b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/dg_activate.txt index 76d66bc49..34eca1aee 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/dg_activate.txt +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/dg_activate.txt @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ # MODULE NAME:RPC NAME:VERSION:MODE # Example -> APPC:GetDeviceRunningConfiguration:3.0.0:sync APPC:CheckConfigStatus:4.0.0:sync @@ -83,4 +104,4 @@ APPC:DGOrchestrator:4.0.0:sync APPC:VM_Start:2.0.0:sync APPC:VM_Stop:2.0.0:sync APPC:AttachVolumeVM:4.0.0:sync -APPC:DetachVolumeVM:4.0.0:sync
\ No newline at end of file +APPC:DetachVolumeVM:4.0.0:sync diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml index ec9fba843..493785b57 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml @@ -1,3 +1,24 @@ +# ============LICENSE_START==========================================
+# ONAP : APPC
+# ===================================================================
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# ===================================================================
+#
+# Unless otherwise specified, all software contained herein is licensed
+# under the Apache License, Version 2.0 (the License);
+# you may not use this software 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.
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# ============LICENSE_END============================================
---
kind: "Property Definition"
version: "V1"
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml index f065c3058..0c638875d 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml @@ -1,3 +1,24 @@ +# ============LICENSE_START==========================================
+# ONAP : APPC
+# ===================================================================
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# ===================================================================
+#
+# Unless otherwise specified, all software contained herein is licensed
+# under the Apache License, Version 2.0 (the License);
+# you may not use this software 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.
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# ============LICENSE_END============================================
---
kind: "Property Definition"
version: "V1"
diff --git a/appc-directed-graph/dg-loader/provider/src/test/resources/dg_activate_test b/appc-directed-graph/dg-loader/provider/src/test/resources/dg_activate_test index 895e177d5..84910c759 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/resources/dg_activate_test +++ b/appc-directed-graph/dg-loader/provider/src/test/resources/dg_activate_test @@ -1,3 +1,24 @@ +# ============LICENSE_START==========================================
+# ONAP : APPC
+# ===================================================================
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# ===================================================================
+#
+# Unless otherwise specified, all software contained herein is licensed
+# under the Apache License, Version 2.0 (the License);
+# you may not use this software 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.
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# ============LICENSE_END============================================
# MODULE NAME:RPC NAME:VERSION:MODE
# Example -> APPC:GetDeviceRunningConfiguration:3.0.0:sync
-Appc:UniTest:4.0.0:sync
\ No newline at end of file +Appc:UniTest:4.0.0:sync
diff --git a/appc-inbound/appc-artifact-handler/model/scripts/python/yang2props.py b/appc-inbound/appc-artifact-handler/model/scripts/python/yang2props.py index 559d31b8b..e1ce2e093 100755 --- a/appc-inbound/appc-artifact-handler/model/scripts/python/yang2props.py +++ b/appc-inbound/appc-artifact-handler/model/scripts/python/yang2props.py @@ -1,3 +1,26 @@ +''' +/*- +* ============LICENSE_START======================================================= +* ONAP : APPC +* ================================================================================ +* Copyright (C) 2017-2018 AT&T Intellectual Property. All 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. +* +* ECOMP is a trademark and service mark of AT&T Intellectual Property. +* ============LICENSE_END========================================================= +*/ +''' #!/usr/bin/python import re @@ -28,7 +51,7 @@ with open(sys.argv[1], "r") as ins: match = re.search(r'leaf (\S+)', line) if match: leaf = match.group(1) - + # if we see enum convert the value to enum format and see if it changed # if the value is different write a property entry if "enum " in line: diff --git a/appc-inbound/appc-design-services/model/scripts/python/yang2props.py b/appc-inbound/appc-design-services/model/scripts/python/yang2props.py index 559d31b8b..1cba3ff6d 100755 --- a/appc-inbound/appc-design-services/model/scripts/python/yang2props.py +++ b/appc-inbound/appc-design-services/model/scripts/python/yang2props.py @@ -1,3 +1,26 @@ +''' +/*- +* ============LICENSE_START======================================================= +* ONAP : APPC +* ================================================================================ +* Copyright (C) 2017-2018 AT&T Intellectual Property. All 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. +* +* ECOMP is a trademark and service mark of AT&T Intellectual Property. +* ============LICENSE_END========================================================= +*/ +''' #!/usr/bin/python import re diff --git a/appc-inbound/appc-interfaces-service/.pydevproject b/appc-inbound/appc-interfaces-service/.pydevproject index 40e9f40a0..1683b202c 100644 --- a/appc-inbound/appc-interfaces-service/.pydevproject +++ b/appc-inbound/appc-interfaces-service/.pydevproject @@ -1,3 +1,26 @@ +<!-- +============LICENSE_START========================================== +ONAP : APPC +=================================================================== +Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +=================================================================== + +Unless otherwise specified, all software contained herein is licensed +under the Apache License, Version 2.0 (the License); +you may not use this software 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. + +ECOMP is a trademark and service mark of AT&T Intellectual Property. +============LICENSE_END============================================ +--> <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?eclipse-pydev version="1.0"?><pydev_project> <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> diff --git a/appc-inbound/appc-interfaces-service/model/scripts/python/yang2props.py b/appc-inbound/appc-interfaces-service/model/scripts/python/yang2props.py index 559d31b8b..8962c5f5e 100644 --- a/appc-inbound/appc-interfaces-service/model/scripts/python/yang2props.py +++ b/appc-inbound/appc-interfaces-service/model/scripts/python/yang2props.py @@ -1,3 +1,26 @@ +''' +/*- +* ============LICENSE_START======================================================= +* ONAP : APPC +* ================================================================================ +* Copyright (C) 2017-2018 AT&T Intellectual Property. All 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. +* +* ECOMP is a trademark and service mark of AT&T Intellectual Property. +* ============LICENSE_END========================================================= +*/ +''' #!/usr/bin/python import re @@ -28,7 +51,7 @@ with open(sys.argv[1], "r") as ins: match = re.search(r'leaf (\S+)', line) if match: leaf = match.group(1) - + # if we see enum convert the value to enum format and see if it changed # if the value is different write a property entry if "enum " in line: @@ -54,4 +77,4 @@ fo.write("\n") # Close opend file fo.close() - + diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter.txt b/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter.txt index 1e2d347fc..1cec7f6d0 100644 --- a/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter.txt +++ b/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter.txt @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ name: "LOCAL_CORE_ALT_IP_ADDR" description: null type: null diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter2.txt b/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter2.txt index cebc0f9e1..46560e323 100644 --- a/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter2.txt +++ b/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter2.txt @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ name: "REMOTE_ACCESS_IP_ADDR" description: null type: null diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter3.txt b/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter3.txt index 060b55eae..ab17c2546 100644 --- a/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter3.txt +++ b/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter3.txt @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ name: "PARAM3" description: null type: null diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter4.txt b/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter4.txt index e334903d1..a9d0fbbd7 100644 --- a/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter4.txt +++ b/appc-outbound/appc-network-inventory-client/provider/src/test/resources/YamlParameter4.txt @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ name: "PARAM4" description: null type: null diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/onap/appc/provider/lcm/mock/query/query b/appc-provider/appc-provider-bundle/src/main/java/org/onap/appc/provider/lcm/mock/query/query index 671e77cd0..426fc985c 100644 --- a/appc-provider/appc-provider-bundle/src/main/java/org/onap/appc/provider/lcm/mock/query/query +++ b/appc-provider/appc-provider-bundle/src/main/java/org/onap/appc/provider/lcm/mock/query/query @@ -1,3 +1,25 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ + ################################################################################################## # # Mock data file for LCM command Query @@ -44,4 +66,4 @@ STATUS_bex005=unhealthy VMS_vSBG=vm001 STATE_vm001=STANDBY -STATUS_vm001=healthy
\ No newline at end of file +STATUS_vm001=healthy diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/ci/conf/attsdc-packages.yaml b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/ci/conf/attsdc-packages.yaml index 8385dc988..db3ae3bd8 100644 --- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/ci/conf/attsdc-packages.yaml +++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/ci/conf/attsdc-packages.yaml @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ packages: - org.openecomp.tlv.sdc.ci.tests.execute.general - org.openecomp.tlv.sdc.ci.tests.execute.user @@ -7,4 +28,4 @@ packages: - org.openecomp.tlv.sdc.ci.tests.execute.service - org.openecomp.tlv.sdc.ci.tests.execute.artifacts - org.openecomp.tlv.sdc.ci.tests.execute.imports - - org.openecomp.tlv.sdc.ci.tests.execute.category
\ No newline at end of file + - org.openecomp.tlv.sdc.ci.tests.execute.category diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/ci/conf/attsdc.yaml b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/ci/conf/attsdc.yaml index 7e612fe9b..666778cde 100644 --- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/ci/conf/attsdc.yaml +++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/ci/conf/attsdc.yaml @@ -1,3 +1,24 @@ +# ============LICENSE_START========================================== +# ONAP : APPC +# =================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the License); +# you may not use this software 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END============================================ outputFolder: target reportName: index.html catalogBeHost: localhost @@ -32,4 +53,4 @@ resourcesNotToDelete: - tosca.nodes.BlockStorage - tosca.nodes.LoadBalancer - org.openecomp.d2.resource.cp.Port - - org.openecomp.d2.resource.vl.Network
\ No newline at end of file + - org.openecomp.d2.resource.vl.Network diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/resources/output/resource-ResourceAppc-template.yml b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/resources/output/resource-ResourceAppc-template.yml index 3ce3d1259..117fedae4 100644 --- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/resources/output/resource-ResourceAppc-template.yml +++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/resources/output/resource-ResourceAppc-template.yml @@ -1 +1 @@ -tosca_definitions_version: tosca_simple_yaml_1_0metadata: invariantUUID: 1f4f4e0e-a607-47a3-87b6-8d9a57007044 UUID: add63ad1-c6fe-4807-bdcf-a4b612b85a7a name: Resource-APPC description: desc type: VF category: Application L4+ subcategory: Media Servers resourceVendor: Vendor-1 resourceVendorRelease: '12345'imports:- Resource-APPC-interface: file: resource-ResourceAppc-template-interface.yml- NovaServer: file: resource-Novaserver-template.ymltopology_template: node_templates: NovaServer 1: type: org.openecomp.resource.vfc.nodes.heat.nova.Server metadata: invariantUUID: 28146796-4a0e-4e1e-bbd5-e1c87ec7a6cb UUID: cf7b9556-a7ed-421a-b611-6bd64b4aa6df customizationUUID: 0295fd77-0e14-4dd3-9a01-c00082694b88 version: '1.0' name: NovaServer description: Represents a real or virtual machine or server. Information specified on the Compute node will be used to find the machine that fits the given requirements in the cloud available machines. If no sizing information are specified the cloud provider default machine will be used. It is strongly recommended to specify the required CPUs and memory at least. type: VFC category: Generic subcategory: Infrastructure properties: image_update_policy: REBUILD software_config_transport: POLL_SERVER_CFN contrail_service_instance_ind: false user_data_format: HEAT_CFNTOOLS user_data_update_policy: REPLACE flavor_update_policy: RESIZE groups: { } substitution_mappings: node_type: org.openecomp.resource.vf.ResourceAppc capabilities: novaserver1.disk.device.write.bytes: - NovaServer 1 - disk.device.write.bytes novaserver1.memory.usage: - NovaServer 1 - memory.usage novaserver1.instance: - NovaServer 1 - instance novaserver1.scalable: - NovaServer 1 - scalable novaserver1.disk.usage: - NovaServer 1 - disk.usage novaserver1.disk.device.write.requests: - NovaServer 1 - disk.device.write.requests novaserver1.cpu.delta: - NovaServer 1 - cpu.delta novaserver1.disk.device.read.bytes: - NovaServer 1 - disk.device.read.bytes novaserver1.disk.write.requests.rate: - NovaServer 1 - disk.write.requests.rate novaserver1.disk.iops: - NovaServer 1 - disk.iops novaserver1.disk.latency: - NovaServer 1 - disk.latency novaserver1.cpu: - NovaServer 1 - cpu novaserver1.feature: - NovaServer 1 - feature novaserver1.host: - NovaServer 1 - host novaserver1.disk.write.bytes: - NovaServer 1 - disk.write.bytes novaserver1.disk.device.usage: - NovaServer 1 - disk.device.usage novaserver1.disk.device.write.bytes.rate: - NovaServer 1 - disk.device.write.bytes.rate novaserver1.disk.device.write.requests.rate: - NovaServer 1 - disk.device.write.requests.rate novaserver1.vcpus: - NovaServer 1 - vcpus novaserver1.binding: - NovaServer 1 - binding novaserver1.disk.write.bytes.rate: - NovaServer 1 - disk.write.bytes.rate novaserver1.disk.device.allocation: - NovaServer 1 - disk.device.allocation novaserver1.disk.device.read.bytes.rate: - NovaServer 1 - disk.device.read.bytes.rate novaserver1.memory.resident: - NovaServer 1 - memory.resident novaserver1.disk.read.requests: - NovaServer 1 - disk.read.requests novaserver1.disk.read.bytes.rate: - NovaServer 1 - disk.read.bytes.rate novaserver1.disk.capacity: - NovaServer 1 - disk.capacity novaserver1.memory: - NovaServer 1 - memory novaserver1.cpu_util: - NovaServer 1 - cpu_util novaserver1.os: - NovaServer 1 - os novaserver1.disk.allocation: - NovaServer 1 - disk.allocation novaserver1.disk.device.latency: - NovaServer 1 - disk.device.latency novaserver1.endpoint: - NovaServer 1 - endpoint novaserver1.disk.root.size: - NovaServer 1 - disk.root.size novaserver1.disk.device.iops: - NovaServer 1 - disk.device.iops novaserver1.disk.device.capacity: - NovaServer 1 - disk.device.capacity novaserver1.disk.device.read.requests: - NovaServer 1 - disk.device.read.requests novaserver1.disk.write.requests: - NovaServer 1 - disk.write.requests novaserver1.disk.ephemeral.size: - NovaServer 1 - disk.ephemeral.size novaserver1.disk.device.read.requests.rate: - NovaServer 1 - disk.device.read.requests.rate novaserver1.disk.read.bytes: - NovaServer 1 - disk.read.bytes requirements: novaserver1.dependency: - NovaServer 1 - dependency novaserver1.local_storage: - NovaServer 1 - local_storage
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0metadata: invariantUUID: 1f4f4e0e-a607-47a3-87b6-8d9a57007044 UUID: add63ad1-c6fe-4807-bdcf-a4b612b85a7a name: Resource-APPC description: desc type: VF category: Application L4+ subcategory: Media Servers resourceVendor: Vendor-1 resourceVendorRelease: '12345'imports:- Resource-APPC-interface: file: resource-ResourceAppc-template-interface.yml- NovaServer: file: resource-Novaserver-template.ymltopology_template: node_templates: NovaServer 1: type: org.openecomp.resource.vfc.nodes.heat.nova.Server metadata: invariantUUID: 28146796-4a0e-4e1e-bbd5-e1c87ec7a6cb UUID: cf7b9556-a7ed-421a-b611-6bd64b4aa6df customizationUUID: 0295fd77-0e14-4dd3-9a01-c00082694b88 version: '1.0' name: NovaServer description: Represents a real or virtual machine or server. Information specified on the Compute node will be used to find the machine that fits the given requirements in the cloud available machines. If no sizing information are specified the cloud provider default machine will be used. It is strongly recommended to specify the required CPUs and memory at least. type: VFC category: Generic subcategory: Infrastructure properties: image_update_policy: REBUILD software_config_transport: POLL_SERVER_CFN contrail_service_instance_ind: false user_data_format: HEAT_CFNTOOLS user_data_update_policy: REPLACE flavor_update_policy: RESIZE groups: { } substitution_mappings: node_type: org.openecomp.resource.vf.ResourceAppc capabilities: novaserver1.disk.device.write.bytes: - NovaServer 1 - disk.device.write.bytes novaserver1.memory.usage: - NovaServer 1 - memory.usage novaserver1.instance: - NovaServer 1 - instance novaserver1.scalable: - NovaServer 1 - scalable novaserver1.disk.usage: - NovaServer 1 - disk.usage novaserver1.disk.device.write.requests: - NovaServer 1 - disk.device.write.requests novaserver1.cpu.delta: - NovaServer 1 - cpu.delta novaserver1.disk.device.read.bytes: - NovaServer 1 - disk.device.read.bytes novaserver1.disk.write.requests.rate: - NovaServer 1 - disk.write.requests.rate novaserver1.disk.iops: - NovaServer 1 - disk.iops novaserver1.disk.latency: - NovaServer 1 - disk.latency novaserver1.cpu: - NovaServer 1 - cpu novaserver1.feature: - NovaServer 1 - feature novaserver1.host: - NovaServer 1 - host novaserver1.disk.write.bytes: - NovaServer 1 - disk.write.bytes novaserver1.disk.device.usage: - NovaServer 1 - disk.device.usage novaserver1.disk.device.write.bytes.rate: - NovaServer 1 - disk.device.write.bytes.rate novaserver1.disk.device.write.requests.rate: - NovaServer 1 - disk.device.write.requests.rate novaserver1.vcpus: - NovaServer 1 - vcpus novaserver1.binding: - NovaServer 1 - binding novaserver1.disk.write.bytes.rate: - NovaServer 1 - disk.write.bytes.rate novaserver1.disk.device.allocation: - NovaServer 1 - disk.device.allocation novaserver1.disk.device.read.bytes.rate: - NovaServer 1 - disk.device.read.bytes.rate novaserver1.memory.resident: - NovaServer 1 - memory.resident novaserver1.disk.read.requests: - NovaServer 1 - disk.read.requests novaserver1.disk.read.bytes.rate: - NovaServer 1 - disk.read.bytes.rate novaserver1.disk.capacity: - NovaServer 1 - disk.capacity novaserver1.memory: - NovaServer 1 - memory novaserver1.cpu_util: - NovaServer 1 - cpu_util novaserver1.os: - NovaServer 1 - os novaserver1.disk.allocation: - NovaServer 1 - disk.allocation novaserver1.disk.device.latency: - NovaServer 1 - disk.device.latency novaserver1.endpoint: - NovaServer 1 - endpoint novaserver1.disk.root.size: - NovaServer 1 - disk.root.size novaserver1.disk.device.iops: - NovaServer 1 - disk.device.iops novaserver1.disk.device.capacity: - NovaServer 1 - disk.device.capacity novaserver1.disk.device.read.requests: - NovaServer 1 - disk.device.read.requests novaserver1.disk.write.requests: - NovaServer 1 - disk.write.requests novaserver1.disk.ephemeral.size: - NovaServer 1 - disk.ephemeral.size novaserver1.disk.device.read.requests.rate: - NovaServer 1 - disk.device.read.requests.rate novaserver1.disk.read.bytes: - NovaServer 1 - disk.read.bytes requirements: novaserver1.dependency: - NovaServer 1 - dependency novaserver1.local_storage: - NovaServer 1 - local_storage diff --git a/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm b/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm index 45bef9d62..1b8a78d28 100644 --- a/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm +++ b/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm @@ -1,3 +1,26 @@ +/* +============LICENSE_START========================================== +ONAP : APPC +=================================================================== +Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +=================================================================== + +Unless otherwise specified, all software contained herein is licensed +under the Apache License, Version 2.0 (the License); +you may not use this software 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. + +ECOMP is a trademark and service mark of AT&T Intellectual Property. +============LICENSE_END============================================ +*/ module $moduleName { yang-version 1; namespace "org:onap:appc:vnf:$moduleName"; diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/yang/sequence-generator.yang b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/yang/sequence-generator.yang index eac669bae..0122107f5 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/yang/sequence-generator.yang +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/yang/sequence-generator.yang @@ -1,3 +1,27 @@ +/* +============LICENSE_START========================================== +ONAP : APPC +=================================================================== +Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +=================================================================== + +Unless otherwise specified, all software contained herein is licensed +under the Apache License, Version 2.0 (the License); +you may not use this software 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. + +ECOMP is a trademark and service mark of AT&T Intellectual Property. +============LICENSE_END============================================ +*/ + module sequence-generator-impl { yang-version 1; |