Added licenses to VNF and NS openmano descriptors. Removed module-blueprints folder.

Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/module-blueprints/README b/module-blueprints/README
deleted file mode 100644 (file)
index 4c9f188..0000000
--- a/module-blueprints/README
+++ /dev/null
@@ -1 +0,0 @@
-This folder contains the blueprints for the module

diff --git a/scenarios/examples/complex.yaml b/scenarios/examples/complex.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 074c801..676dd9c
--- a/scenarios/examples/complex.yaml
+++ b/scenarios/examples/complex.yaml
@@ -1,3 +1,23 @@
+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# All 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
 ---
 name:            complex
 description:     Complex network scenario consisting of 4 VNFs interconnected

diff --git a/scenarios/examples/complex2.yaml b/scenarios/examples/complex2.yaml
old mode 100755 (executable)
new mode 100644 (file)
index fc4bd72..b8969cf
--- a/scenarios/examples/complex2.yaml
+++ b/scenarios/examples/complex2.yaml
@@ -1,3 +1,23 @@
+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# All 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
 ---
 name:            complex2
 description:     Complex network scenario consisting of 2 VNFs interconnected

diff --git a/scenarios/examples/simple.yaml b/scenarios/examples/simple.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 7ea2b4b..7cba170
--- a/scenarios/examples/simple.yaml
+++ b/scenarios/examples/simple.yaml
@@ -1,3 +1,23 @@
+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# All 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
 ---
 name:            simple
 description:     Simple network scenario consisting of a single VNF connected to an external network

diff --git a/scenarios/scenario-template.yaml b/scenarios/scenario-template.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 34c6fb1..66ecab3
--- a/scenarios/scenario-template.yaml
+++ b/scenarios/scenario-template.yaml
@@ -1,3 +1,23 @@
+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# All 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
 ---
 name:            insert a name for the scenario
 description:     insert a description for the scenario

diff --git a/utils/__init__.py b/utils/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/vnfs/examples/dataplaneVNF1.yaml b/vnfs/examples/dataplaneVNF1.yaml
index fdcf197..3d70230 100644 (file)
--- a/vnfs/examples/dataplaneVNF1.yaml
+++ b/vnfs/examples/dataplaneVNF1.yaml
@@ -1,3 +1,23 @@
+##\r
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.\r
+# This file is part of openmano\r
+# All Rights Reserved.\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License"); you may\r
+# not use this file except in compliance with the License. You may obtain\r
+# a copy of the License at\r
+#\r
+#         http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r
+# License for the specific language governing permissions and limitations\r
+# under the License.\r
+#\r
+# For those usages not covered by the Apache License, Version 2.0 please\r
+# contact with: nfvlabs@tid.es\r
+##\r
 ---\r
 vnf:\r
     name:        dataplaneVNF1\r

diff --git a/vnfs/examples/dataplaneVNF2.yaml b/vnfs/examples/dataplaneVNF2.yaml
index 6196a8d..6760ed7 100644 (file)
--- a/vnfs/examples/dataplaneVNF2.yaml
+++ b/vnfs/examples/dataplaneVNF2.yaml
@@ -1,3 +1,23 @@
+##\r
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.\r
+# This file is part of openmano\r
+# All Rights Reserved.\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License"); you may\r
+# not use this file except in compliance with the License. You may obtain\r
+# a copy of the License at\r
+#\r
+#         http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r
+# License for the specific language governing permissions and limitations\r
+# under the License.\r
+#\r
+# For those usages not covered by the Apache License, Version 2.0 please\r
+# contact with: nfvlabs@tid.es\r
+##\r
 ---\r
 vnf:\r
     name:        dataplaneVNF2\r

diff --git a/vnfs/examples/dataplaneVNF3.yaml b/vnfs/examples/dataplaneVNF3.yaml
index ce59035..73d2cf9 100644 (file)
--- a/vnfs/examples/dataplaneVNF3.yaml
+++ b/vnfs/examples/dataplaneVNF3.yaml
@@ -1,3 +1,23 @@
+##\r
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.\r
+# This file is part of openmano\r
+# All Rights Reserved.\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License"); you may\r
+# not use this file except in compliance with the License. You may obtain\r
+# a copy of the License at\r
+#\r
+#         http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r
+# License for the specific language governing permissions and limitations\r
+# under the License.\r
+#\r
+# For those usages not covered by the Apache License, Version 2.0 please\r
+# contact with: nfvlabs@tid.es\r
+##\r
 ---\r
 vnf:\r
     name:        dataplaneVNF3\r

diff --git a/vnfs/examples/dataplaneVNF_2VMs.yaml b/vnfs/examples/dataplaneVNF_2VMs.yaml
index bd84aba..1e468fe 100644 (file)
--- a/vnfs/examples/dataplaneVNF_2VMs.yaml
+++ b/vnfs/examples/dataplaneVNF_2VMs.yaml
@@ -1,3 +1,23 @@
+##\r
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.\r
+# This file is part of openmano\r
+# All Rights Reserved.\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License"); you may\r
+# not use this file except in compliance with the License. You may obtain\r
+# a copy of the License at\r
+#\r
+#         http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r
+# License for the specific language governing permissions and limitations\r
+# under the License.\r
+#\r
+# For those usages not covered by the Apache License, Version 2.0 please\r
+# contact with: nfvlabs@tid.es\r
+##\r
 ---\r
 vnf:\r
     name:        dataplaneVNF_2VMs\r

diff --git a/vnfs/examples/linux.yaml b/vnfs/examples/linux.yaml
index c157618..796873f 100644 (file)
--- a/vnfs/examples/linux.yaml
+++ b/vnfs/examples/linux.yaml
@@ -1,3 +1,23 @@
+##\r
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.\r
+# This file is part of openmano\r
+# All Rights Reserved.\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License"); you may\r
+# not use this file except in compliance with the License. You may obtain\r
+# a copy of the License at\r
+#\r
+#         http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r
+# License for the specific language governing permissions and limitations\r
+# under the License.\r
+#\r
+# For those usages not covered by the Apache License, Version 2.0 please\r
+# contact with: nfvlabs@tid.es\r
+##\r
 ---\r
 vnf:\r
     name:        linux\r

diff --git a/vnfs/vnf-template-2vm.yaml b/vnfs/vnf-template-2vm.yaml
index b12476b..b1615db 100644 (file)
--- a/vnfs/vnf-template-2vm.yaml
+++ b/vnfs/vnf-template-2vm.yaml
@@ -1,3 +1,23 @@
+##\r
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.\r
+# This file is part of openmano\r
+# All Rights Reserved.\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License"); you may\r
+# not use this file except in compliance with the License. You may obtain\r
+# a copy of the License at\r
+#\r
+#         http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r
+# License for the specific language governing permissions and limitations\r
+# under the License.\r
+#\r
+# For those usages not covered by the Apache License, Version 2.0 please\r
+# contact with: nfvlabs@tid.es\r
+##\r
 ---\r
 vnf:\r
     name: TEMPLATE-2VM\r

diff --git a/vnfs/vnf-template.yaml b/vnfs/vnf-template.yaml
index 31c8655..5b33512 100644 (file)
--- a/vnfs/vnf-template.yaml
+++ b/vnfs/vnf-template.yaml
@@ -1,3 +1,23 @@
+##\r
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.\r
+# This file is part of openmano\r
+# All Rights Reserved.\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License"); you may\r
+# not use this file except in compliance with the License. You may obtain\r
+# a copy of the License at\r
+#\r
+#         http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r
+# License for the specific language governing permissions and limitations\r
+# under the License.\r
+#\r
+# For those usages not covered by the Apache License, Version 2.0 please\r
+# contact with: nfvlabs@tid.es\r
+##\r
 ---\r
 vnf:\r
     name: TEMPLATE\r