From: peusterm Date: Mon, 1 Oct 2018 14:25:44 +0000 (+0200) Subject: Fixes bug 553: Missing license headers X-Git-Tag: v5.0.0~8 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=102d7268b0f64ecdf9c88c0a8b93c54dea1dd908 Fixes bug 553: Missing license headers Change-Id: I8fd3d74a242fa52d93b82840b5deea393f8f17a9 Signed-off-by: peusterm --- diff --git a/Jenkinsfile b/Jenkinsfile index 6d81a56..5a9d85a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,24 @@ +// Copyright (c) 2018 by Paderborn University +// (manuel@peuster.de) +// ALL 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. +// +// Neither the name of the OSM, Paderborn University +// nor the names of its contributors may be used to endorse or promote +// products derived from this software without specific prior written +// permission. + properties([ parameters([ string(defaultValue: env.BRANCH_NAME, description: '', name: 'GERRIT_BRANCH'), diff --git a/examples/services/hackfest_1_nsd.tar.gz b/examples/services/hackfest_1_nsd.tar.gz index ca13889..7e2b2dd 100644 Binary files a/examples/services/hackfest_1_nsd.tar.gz and b/examples/services/hackfest_1_nsd.tar.gz differ diff --git a/examples/services/hackfest_1_nsd/icons/osm.png b/examples/services/hackfest_1_nsd/icons/osm.png deleted file mode 100644 index 62012d2..0000000 Binary files a/examples/services/hackfest_1_nsd/icons/osm.png and /dev/null differ diff --git a/examples/services/hackfest_2_nsd.tar.gz b/examples/services/hackfest_2_nsd.tar.gz index 9170de9..2bba135 100644 Binary files a/examples/services/hackfest_2_nsd.tar.gz and b/examples/services/hackfest_2_nsd.tar.gz differ diff --git a/examples/services/hackfest_2_nsd/icons/osm.png b/examples/services/hackfest_2_nsd/icons/osm.png deleted file mode 100644 index 62012d2..0000000 Binary files a/examples/services/hackfest_2_nsd/icons/osm.png and /dev/null differ diff --git a/examples/services/pingpong_nsd.tar.gz b/examples/services/pingpong_nsd.tar.gz index e5d9202..db00a93 100644 Binary files a/examples/services/pingpong_nsd.tar.gz and b/examples/services/pingpong_nsd.tar.gz differ diff --git a/examples/vnfs/hackfest_1_vnfd.tar.gz b/examples/vnfs/hackfest_1_vnfd.tar.gz index 622634e..f0c8004 100644 Binary files a/examples/vnfs/hackfest_1_vnfd.tar.gz and b/examples/vnfs/hackfest_1_vnfd.tar.gz differ diff --git a/examples/vnfs/hackfest_1_vnfd/icons/osm.png b/examples/vnfs/hackfest_1_vnfd/icons/osm.png deleted file mode 100644 index 62012d2..0000000 Binary files a/examples/vnfs/hackfest_1_vnfd/icons/osm.png and /dev/null differ diff --git a/examples/vnfs/hackfest_2_vnfd.tar.gz b/examples/vnfs/hackfest_2_vnfd.tar.gz index c4d5037..c0cf0ed 100644 Binary files a/examples/vnfs/hackfest_2_vnfd.tar.gz and b/examples/vnfs/hackfest_2_vnfd.tar.gz differ diff --git a/examples/vnfs/hackfest_2_vnfd/icons/osm.png b/examples/vnfs/hackfest_2_vnfd/icons/osm.png deleted file mode 100644 index 62012d2..0000000 Binary files a/examples/vnfs/hackfest_2_vnfd/icons/osm.png and /dev/null differ diff --git a/examples/vnfs/ping.tar.gz b/examples/vnfs/ping.tar.gz index c19270b..d8a023c 100644 Binary files a/examples/vnfs/ping.tar.gz and b/examples/vnfs/ping.tar.gz differ diff --git a/examples/vnfs/pong.tar.gz b/examples/vnfs/pong.tar.gz index 085c00a..087c64d 100644 Binary files a/examples/vnfs/pong.tar.gz and b/examples/vnfs/pong.tar.gz differ diff --git a/misc/eu.5gtango.emulator-example-service.0.1.tgo b/misc/eu.5gtango.emulator-example-service.0.1.tgo index a879139..36bfa4f 100644 Binary files a/misc/eu.5gtango.emulator-example-service.0.1.tgo and b/misc/eu.5gtango.emulator-example-service.0.1.tgo differ diff --git a/misc/sonata-demo-service.son b/misc/sonata-demo-service.son deleted file mode 100755 index 934fcd7..0000000 Binary files a/misc/sonata-demo-service.son and /dev/null differ diff --git a/misc/tango-demo-service-project/project.yml b/misc/tango-demo-service-project/project.yml index 9c53a0f..a1b1bc9 100755 --- a/misc/tango-demo-service-project/project.yml +++ b/misc/tango-demo-service-project/project.yml @@ -1,3 +1,24 @@ +# Copyright (c) 2018 by Paderborn University +# (manuel@peuster.de) +# ALL 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. +# +# Neither the name of the OSM, Paderborn University +# nor the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +--- descriptor_extension: yml version: '0.5' files: diff --git a/misc/tango-demo-service-project/tango_default-vnf0.yml b/misc/tango-demo-service-project/tango_default-vnf0.yml index b08bb10..7a9e4c4 100755 --- a/misc/tango-demo-service-project/tango_default-vnf0.yml +++ b/misc/tango-demo-service-project/tango_default-vnf0.yml @@ -1,3 +1,24 @@ +# Copyright (c) 2018 by Paderborn University +# (manuel@peuster.de) +# ALL 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. +# +# Neither the name of the OSM, Paderborn University +# nor the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +--- descriptor_schema: >- https://raw.githubusercontent.com/sonata-nfv/tng-schema/master/function-descriptor/vnfd-schema.yml vendor: eu.5gtango diff --git a/misc/tango-demo-service-project/tango_default-vnf1.yml b/misc/tango-demo-service-project/tango_default-vnf1.yml index 7bcecb6..b5ed4c5 100755 --- a/misc/tango-demo-service-project/tango_default-vnf1.yml +++ b/misc/tango-demo-service-project/tango_default-vnf1.yml @@ -1,3 +1,24 @@ +# Copyright (c) 2018 by Paderborn University +# (manuel@peuster.de) +# ALL 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. +# +# Neither the name of the OSM, Paderborn University +# nor the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +--- descriptor_schema: >- https://raw.githubusercontent.com/sonata-nfv/tng-schema/master/function-descriptor/vnfd-schema.yml vendor: eu.5gtango diff --git a/misc/tango-demo-service-project/tango_emulator_example.yml b/misc/tango-demo-service-project/tango_emulator_example.yml index 43f2220..21f029f 100755 --- a/misc/tango-demo-service-project/tango_emulator_example.yml +++ b/misc/tango-demo-service-project/tango_emulator_example.yml @@ -1,3 +1,24 @@ +# Copyright (c) 2018 by Paderborn University +# (manuel@peuster.de) +# ALL 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. +# +# Neither the name of the OSM, Paderborn University +# nor the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +--- descriptor_schema: >- https://raw.githubusercontent.com/sonata-nfv/tng-schema/master/service-descriptor/nsd-schema.yml vendor: eu.5gtango diff --git a/pytest.ini b/pytest.ini index 137eee5..4dbf692 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,3 +1,23 @@ +; Copyright (c) 2018 by Paderborn University +; (manuel@peuster.de) +; ALL 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. +; +; Neither the name of the OSM, Paderborn University +; nor the names of its contributors may be used to endorse or promote +; products derived from this software without specific prior written +; permission. [pytest] addopts = --ignore devops log_level = DEBUG diff --git a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py deleted file mode 100755 index cb18c57..0000000 --- a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py +++ /dev/null @@ -1,276 +0,0 @@ -# Copyright (c) 2015 SONATA-NFV and Paderborn University -# ALL 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. -# -# Neither the name of the SONATA-NFV, Paderborn University -# nor the names of its contributors may be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# This work has been performed in the framework of the SONATA project, -# funded by the European Commission under Grant number 671517 through -# the Horizon 2020 and 5G-PPP programmes. The authors would like to -# acknowledge the contributions of their colleagues of the SONATA -# partner consortium (www.sonata-nfv.eu). -import time -import requests -import json -import unittest -from emuvim.test.base import SimpleTestTopology -from emuvim.api.sonata import SonataDummyGatekeeperEndpoint -from emuvim.api.sonata.dummygatekeeper import initialize_GK, parse_interface -from ipaddress import ip_network - -PACKAGE_PATH = "misc/sonata-demo-service.son" - - -class testSonataDummyGatekeeper(SimpleTestTopology): - - # @unittest.skip("disabled") - def test_GK_Api_start_service(self): - # create network - self.createNet(nswitches=0, ndatacenter=2, nhosts=2, - ndockers=0, enable_learning=True) - # setup links - self.net.addLink(self.dc[0], self.h[0]) - self.net.addLink(self.dc[0], self.dc[1]) - self.net.addLink(self.h[1], self.dc[1]) - # connect dummy GK to data centers - sdkg1 = SonataDummyGatekeeperEndpoint("127.0.0.1", 55000) - sdkg1.connectDatacenter(self.dc[0]) - sdkg1.connectDatacenter(self.dc[1]) - # run the dummy gatekeeper (in another thread, don't block) - sdkg1.start() - time.sleep(3) - # start Mininet network - self.startNet() - time.sleep(3) - - print "starting tests" - # board package - files = {"package": open(PACKAGE_PATH, "rb")} - r = requests.post("http://127.0.0.1:55000/packages", files=files) - self.assertEqual(r.status_code, 201) - self.assertTrue(json.loads(r.text).get("service_uuid") is not None) - - # instantiate service - self.service_uuid = json.loads(r.text).get("service_uuid") - r2 = requests.post("http://127.0.0.1:55000/instantiations", - data=json.dumps({"service_uuid": self.service_uuid})) - self.assertEqual(r2.status_code, 201) - - # give the emulator some time to instantiate everything - time.sleep(2) - - # check get request APIs - r3 = requests.get("http://127.0.0.1:55000/packages") - self.assertEqual(len(json.loads(r3.text).get("service_uuid_list")), 1) - r4 = requests.get("http://127.0.0.1:55000/instantiations") - self.assertEqual(len(json.loads(r4.text).get( - "service_instantiations_list")), 1) - - # check number of running nodes - self.assertTrue(len(self.getContainernetContainers()) == 3) - self.assertTrue(len(self.net.hosts) == 5) - self.assertTrue(len(self.net.switches) == 2) - # check compute list result - self.assertEqual(len(self.dc[0].listCompute()), 2) - # check connectivity by using ping - ELAN_list = [] - - # check E-Line connection, by checking the IP addresses - for link in self.net.deployed_elines: - vnf_src, intf_src, vnf_sap_docker_name = parse_interface( - link['connection_points_reference'][0]) - print vnf_src, intf_src - src = self.net.getNodeByName(vnf_src) - if not src: - continue - network_list = src.getNetworkStatus() - src_ip = [intf['ip'] - for intf in network_list if intf['intf_name'] == intf_src][0] - src_mask = [intf['netmask'] - for intf in network_list if intf['intf_name'] == intf_src][0] - - vnf_dst, intf_dst, vnf_sap_docker_name = parse_interface( - link['connection_points_reference'][1]) - dst = self.net.getNodeByName(vnf_dst) - if not dst: - continue - network_list = dst.getNetworkStatus() - dst_ip = [intf['ip'] - for intf in network_list if intf['intf_name'] == intf_dst][0] - dst_mask = [intf['netmask'] - for intf in network_list if intf['intf_name'] == intf_dst][0] - - print "src = {0}:{1} ip={2} ".format( - vnf_src, intf_src, src_ip, src_mask) - print "dst = {0}:{1} ip={2} ".format( - vnf_dst, intf_dst, dst_ip, dst_mask) - - # check if the E-Line IP's are in the same subnet - ret = ip_network(u'{0}'.format(src_ip, src_mask), strict=False)\ - .compare_networks(ip_network(u'{0}'.format(dst_ip, dst_mask), strict=False)) - self.assertTrue(ret == 0) - - for vnf in self.dc[0].listCompute(): - # check E LAN connection - network_list = vnf.getNetworkStatus() - mgmt_ip = [intf['ip'] - for intf in network_list if intf['intf_name'] == 'mgmt'] - self.assertTrue(len(mgmt_ip) > 0) - ip_address = mgmt_ip[0] - ELAN_list.append(ip_address) - print ip_address - - # check ELAN connection by ping over the mgmt network (needs to be - # configured as ELAN in the test service) - for vnf in self.dc[0].listCompute(): - network_list = vnf.getNetworkStatus() - mgmt_ip = [intf['ip'] - for intf in network_list if intf['intf_name'] == 'mgmt'] - self.assertTrue(len(mgmt_ip) > 0) - ip_address = mgmt_ip[0] - print ELAN_list - print ip_address - test_ip_list = list(ELAN_list) - test_ip_list.remove(ip_address) - for ip in test_ip_list: - # only take ip address, without netmask - p = self.net.ping([vnf], manualdestip=ip.split('/')[0]) - print p - self.assertTrue(p <= 0.0) - - # stop Mininet network - self.stopNet() - initialize_GK() - - # @unittest.skip("disabled") - def test_GK_Api_stop_service(self): - # create network - self.createNet(ndatacenter=2, nhosts=2) - # setup links - self.net.addLink(self.dc[0], self.h[0]) - self.net.addLink(self.dc[0], self.dc[1]) - self.net.addLink(self.h[1], self.dc[1]) - # connect dummy GK to data centers - sdkg1 = SonataDummyGatekeeperEndpoint("127.0.0.1", 55001) - sdkg1.connectDatacenter(self.dc[0]) - sdkg1.connectDatacenter(self.dc[1]) - # run the dummy gatekeeper (in another thread, don't block) - sdkg1.start() - time.sleep(3) - # start Mininet network - self.startNet() - time.sleep(3) - - print "starting tests" - # board package - files = {"package": open(PACKAGE_PATH, "rb")} - r = requests.post("http://127.0.0.1:55001/packages", files=files) - self.assertEqual(r.status_code, 201) - self.assertTrue(json.loads(r.text).get("service_uuid") is not None) - - # instantiate service - self.service_uuid = json.loads(r.text).get("service_uuid") - r2 = requests.post("http://127.0.0.1:55001/instantiations", - data=json.dumps({"service_uuid": self.service_uuid})) - self.assertEqual(r2.status_code, 201) - - # give the emulator some time to instantiate everything - time.sleep(2) - - # check get request APIs - r3 = requests.get("http://127.0.0.1:55001/packages") - self.assertEqual(len(json.loads(r3.text).get("service_uuid_list")), 1) - r4 = requests.get("http://127.0.0.1:55001/instantiations") - self.assertEqual(len(json.loads(r4.text).get( - "service_instantiations_list")), 1) - - # check number of running nodes - self.assertTrue(len(self.getContainernetContainers()) == 3) - self.assertTrue(len(self.net.hosts) == 5) - self.assertTrue(len(self.net.switches) == 2) - # check compute list result - self.assertEqual(len(self.dc[0].listCompute()), 2) - - # stop the service - service_instance_uuid = json.loads( - r2.text).get("service_instance_uuid") - self.assertTrue(service_instance_uuid is not None) - requests.delete("http://127.0.0.1:55001/instantiations", data=json.dumps( - {"service_uuid": self.service_uuid, "service_instance_uuid": service_instance_uuid})) - - r5 = requests.get("http://127.0.0.1:55001/instantiations") - # note that there was 1 instance before - self.assertTrue(len(json.loads(r5.text).get( - "service_instantiations_list")), 0) - - # stop Mininet network - self.stopNet() - initialize_GK() - - @unittest.skip("disabled") - def test_GK_stress_service(self): - # create network - self.createNet(ndatacenter=2, nhosts=2) - # connect dummy GK to data centers - sdkg1 = SonataDummyGatekeeperEndpoint("127.0.0.1", 55002) - sdkg1.connectDatacenter(self.dc[0]) - sdkg1.connectDatacenter(self.dc[1]) - # run the dummy gatekeeper (in another thread, don't block) - sdkg1.start() - time.sleep(3) - # start Mininet network - self.startNet() - time.sleep(3) - - print "starting tests" - # board package - files = {"package": open("misc/sonata-stress-service.son", "rb")} - r = requests.post("http://127.0.0.1:55002/packages", files=files) - self.assertEqual(r.status_code, 201) - self.assertTrue(json.loads(r.text).get("service_uuid") is not None) - - # instantiate service - self.service_uuid = json.loads(r.text).get("service_uuid") - r2 = requests.post("http://127.0.0.1:55002/instantiations", - data=json.dumps({"service_uuid": self.service_uuid})) - self.assertEqual(r2.status_code, 201) - - # give the emulator some time to instantiate everything - time.sleep(2) - - # check get request APIs - r3 = requests.get("http://127.0.0.1:55002/packages") - self.assertEqual(len(json.loads(r3.text).get("service_uuid_list")), 1) - r4 = requests.get("http://127.0.0.1:55002/instantiations") - self.assertEqual(len(json.loads(r4.text).get( - "service_instantiations_list")), 1) - - # stop the service - service_instance_uuid = json.loads( - r2.text).get("service_instance_uuid") - self.assertTrue(service_instance_uuid is not None) - requests.delete("http://127.0.0.1:55002/instantiations", data=json.dumps( - {"service_uuid": self.service_uuid, "service_instance_uuid": service_instance_uuid})) - - r5 = requests.get("http://127.0.0.1:55002/instantiations") - # note that there was 1 instance before - self.assertTrue(len(json.loads(r5.text).get( - "service_instantiations_list")), 0) - - # stop Mininet network - self.stopNet() - initialize_GK()