X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fopenstack%2Fresources%2Fnet.py;h=db38348d965dbcec534bb603807416b7cb27e1c9;hb=3e16acbebd2c6669c1bbe5a7e3bb313aa1494e20;hp=efb22becbe620aa0421c13ea6d2b2de537bf1c49;hpb=00199782de7042b51927bbbac5540d6f671597bb;p=osm%2Fvim-emu.git diff --git a/src/emuvim/api/openstack/resources/net.py b/src/emuvim/api/openstack/resources/net.py old mode 100644 new mode 100755 index efb22be..db38348 --- a/src/emuvim/api/openstack/resources/net.py +++ b/src/emuvim/api/openstack/resources/net.py @@ -1,3 +1,30 @@ +""" +Copyright (c) 2017 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 re @@ -139,7 +166,7 @@ class Net: """ if cidr is None: if self._cidr is not None: - import emuvim.api.heat.ip_handler as IP + import emuvim.api.openstack.ip_handler as IP IP.free_cidr(self._cidr, self.subnet_id) self._cidr = None self.reset_issued_ip_addresses()