X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Ftest%2Fapi_base.py;h=3464f45f62a4fe8f3a9f4f04383634b0f01d50ba;hb=b5e1c8935bcfbe76bdee4039d160031ba85d8016;hp=e7ab2972d453b9ced9e788b1b235c7a4146e130d;hpb=73efd195b7d0876b76af6caa7ba27fa5bb43fcb2;p=osm%2Fvim-emu.git diff --git a/src/emuvim/test/api_base.py b/src/emuvim/test/api_base.py index e7ab297..3464f45 100755 --- a/src/emuvim/test/api_base.py +++ b/src/emuvim/test/api_base.py @@ -1,3 +1,31 @@ +""" +Copyright (c) 2015 SONATA-NFV +ALL 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 [, ANY ADDITIONAL AFFILIATION] +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). +""" + """ Helper module that implements helpers for test implementations. """ @@ -40,7 +68,7 @@ class SimpleTestTopology(unittest.TestCase): specific controller functionality. """ self.net = DCNetwork(controller=controller, **kwargs) - self.api = RestApiEndpoint("127.0.0.1",5000) + self.api = RestApiEndpoint("127.0.0.1", 5001, self.net) # add some switches # start from s1 because ovs does not like to have dpid = 0 # and switch name-number is being used by mininet to set the dpid @@ -80,7 +108,7 @@ class SimpleTestTopology(unittest.TestCase): Helper to interact with local docker instance. """ if self.docker_cli is None: - self.docker_cli = docker.Client( + self.docker_cli = docker.APIClient( base_url='unix://var/run/docker.sock') return self.docker_cli