Remove k8s_manifest.py
k8s_manifest.py was used by pod, rc and service objects. These objects have been removed recently, so k8s_manifest.py which was used by them is removed with this patch. Change-Id: I5f06f8a0d7b6cc4b7435ef3b645d7585772d70fb Implements: blueprint delete-container-endpoint Partial-Bug: #1627663
This commit is contained in:
parent
22e17cb5ed
commit
bf1ace2c26
|
@ -1,61 +0,0 @@
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
|
|
||||||
import json
|
|
||||||
|
|
||||||
import six
|
|
||||||
import yaml
|
|
||||||
|
|
||||||
from magnum.i18n import _
|
|
||||||
|
|
||||||
|
|
||||||
if hasattr(yaml, 'CSafeDumper'):
|
|
||||||
yaml_dumper = yaml.CSafeDumper
|
|
||||||
else:
|
|
||||||
yaml_dumper = yaml.SafeDumper
|
|
||||||
|
|
||||||
|
|
||||||
def _construct_yaml_str(self, node):
|
|
||||||
# Override the default string handling function
|
|
||||||
# to always return unicode objects
|
|
||||||
return self.construct_scalar(node)
|
|
||||||
|
|
||||||
|
|
||||||
def parse(manifest_str):
|
|
||||||
'''Takes a string and returns a dict containing the parsed structure.
|
|
||||||
|
|
||||||
This includes determination of whether the string is using the
|
|
||||||
JSON or YAML format.
|
|
||||||
'''
|
|
||||||
if not manifest_str:
|
|
||||||
msg = _("'manifest' can't be empty")
|
|
||||||
raise ValueError(msg)
|
|
||||||
if manifest_str.startswith('{'):
|
|
||||||
manifest = json.loads(manifest_str)
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
manifest = yaml.safe_load(manifest_str)
|
|
||||||
except yaml.YAMLError as yea:
|
|
||||||
yea = six.text_type(yea)
|
|
||||||
msg = _('Error parsing manifest: %s') % yea
|
|
||||||
raise ValueError(msg)
|
|
||||||
else:
|
|
||||||
if manifest is None:
|
|
||||||
msg = _("'manifest' can't be empty")
|
|
||||||
raise ValueError(msg)
|
|
||||||
|
|
||||||
if not isinstance(manifest, dict):
|
|
||||||
raise ValueError(_('The manifest is not a JSON object '
|
|
||||||
'or YAML mapping.'))
|
|
||||||
# TODO(yuanying): check manifest version
|
|
||||||
return manifest
|
|
|
@ -1,82 +0,0 @@
|
||||||
# Copyright 2015 NEC Corporation. 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.
|
|
||||||
|
|
||||||
from magnum.common import k8s_manifest
|
|
||||||
from magnum.tests import base
|
|
||||||
|
|
||||||
|
|
||||||
class K8sManifestTestCase(base.TestCase):
|
|
||||||
|
|
||||||
def test_parse_with_json(self):
|
|
||||||
port = 6379
|
|
||||||
containerPort = 6380
|
|
||||||
json_str = '''
|
|
||||||
{
|
|
||||||
"id": "redis-master",
|
|
||||||
"kind": "Service",
|
|
||||||
"apiVersion": "v1",
|
|
||||||
"port": %d,
|
|
||||||
"containerPort": %d,
|
|
||||||
"selector": {
|
|
||||||
"name": "redis-master"
|
|
||||||
},
|
|
||||||
"labels": {
|
|
||||||
"name": "redis-master"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
''' % (port, containerPort)
|
|
||||||
|
|
||||||
manifest = k8s_manifest.parse(json_str)
|
|
||||||
self.assertIsInstance(manifest, dict)
|
|
||||||
self.assertEqual(port, manifest['port'])
|
|
||||||
self.assertEqual(containerPort, manifest['containerPort'])
|
|
||||||
|
|
||||||
def test_parse_with_yaml(self):
|
|
||||||
port = 6389
|
|
||||||
containerPort = 6380
|
|
||||||
yaml_str = '''
|
|
||||||
id: redis-master
|
|
||||||
kind: Service
|
|
||||||
port: %d
|
|
||||||
containerPort: %d
|
|
||||||
selector:
|
|
||||||
name: redis-master
|
|
||||||
labels:
|
|
||||||
name: redis-master
|
|
||||||
''' % (port, containerPort)
|
|
||||||
|
|
||||||
manifest = k8s_manifest.parse(yaml_str)
|
|
||||||
self.assertIsInstance(manifest, dict)
|
|
||||||
self.assertEqual(port, manifest['port'])
|
|
||||||
self.assertEqual(containerPort, manifest['containerPort'])
|
|
||||||
|
|
||||||
def test_parse_invalid_value(self):
|
|
||||||
invalid_str = 'aoa89**'
|
|
||||||
|
|
||||||
self.assertRaises(ValueError, k8s_manifest.parse, invalid_str)
|
|
||||||
|
|
||||||
def test_parse_empty_value(self):
|
|
||||||
empty_str = ''
|
|
||||||
|
|
||||||
self.assertRaises(ValueError, k8s_manifest.parse, empty_str)
|
|
||||||
|
|
||||||
def test_parse_empty_yaml_response(self):
|
|
||||||
blank_str = ' '
|
|
||||||
|
|
||||||
self.assertRaises(ValueError, k8s_manifest.parse, blank_str)
|
|
||||||
|
|
||||||
def test_parse_yaml_error(self):
|
|
||||||
invalid_str = "}invalid: y'm'l3!"
|
|
||||||
|
|
||||||
self.assertRaises(ValueError, k8s_manifest.parse, invalid_str)
|
|
Loading…
Reference in New Issue