"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "monasca_api/conf/types.py" between
monasca-api-3.1.0.tar.gz and monasca-api-4.0.0.tar.gz

About: OpenStack Monasca API is a RESTful API server that is designed with a layered architecture and supports Monitoring as a Service (MONaaS).
The "Ussuri" series (latest release).

types.py  (monasca-api-3.1.0):types.py  (monasca-api-4.0.0)
skipping to change at line 17 skipping to change at line 17
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_config import cfg from oslo_config import cfg
from oslo_config import types from oslo_config import types
from oslo_utils import netutils
class HostAddressPortOpt(cfg.Opt): class HostAddressPortOpt(cfg.Opt):
"""Option for HostAddressPortType. """Option for HostAddressPortType.
Accept hostname or ip address with TCP/IP port number. Accept hostname or ip address with TCP/IP port number.
""" """
def __init__(self, name, **kwargs): def __init__(self, name, **kwargs):
ip_port_type = HostAddressPortType() ip_port_type = HostAddressPortType()
super(HostAddressPortOpt, self).__init__(name, super(HostAddressPortOpt, self).__init__(name,
type=ip_port_type, type=ip_port_type,
**kwargs) **kwargs)
class HostAddressPortType(types.HostAddress): class HostAddressPortType(types.HostAddress):
"""HostAddress with additional port.""" """HostAddress with additional port."""
def __init__(self, version=None): def __init__(self, version=None):
type_name = 'ip and port value' type_name = 'ip and port value'
super(HostAddressPortType, self).__init__(version, type_name=type_name) super(HostAddressPortType, self).__init__(version, type_name=type_name)
def __call__(self, value): def __call__(self, value):
addr, port = value.split(':') addr, port = netutils.parse_host_port(value)
# NOTE(gmann): parse_host_port() return port as None if no port is
# supplied in value so setting port as string for correct
# parsing and error otherwise it will not be parsed for NoneType.
port = 'None' if port is None else port
addr = self.validate_addr(addr) addr = self.validate_addr(addr)
port = self._validate_port(port) port = self._validate_port(port)
if not addr and not port: if not addr and not port:
raise ValueError('%s is not valid ip with optional port') raise ValueError('%s is not valid ip with optional port')
return '%s:%d' % (addr, port) return '%s:%d' % (addr, port)
@staticmethod @staticmethod
def _validate_port(port): def _validate_port(port):
return types.Port()(port) return types.Port()(port)
 End of changes. 2 change blocks. 
1 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)