Remove certificate decoding if not needed
Python3 errors out otherwise Change-Id: I4826fb493fc808595c15fe7a45f5f03afaef872b
This commit is contained in:
parent
fd02556f3a
commit
2e0b45265e
@ -12,6 +12,9 @@
|
||||
# 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 six
|
||||
|
||||
from vmware_nsxlib.v3 import exceptions as nsxlib_exc
|
||||
from vmware_nsxlib.v3 import utils
|
||||
|
||||
@ -82,11 +85,13 @@ class NsxLibTrustManagement(utils.NsxLibApiBase):
|
||||
self.client.delete(resource)
|
||||
|
||||
def find_cert_and_identity(self, name, cert_pem):
|
||||
nsx_style_pem = cert_pem
|
||||
certs = self.get_certs()
|
||||
|
||||
if not isinstance(cert_pem, six.text_type):
|
||||
cert_pem = cert_pem.decode('ascii')
|
||||
|
||||
cert_ids = [cert['id'] for cert in certs
|
||||
if cert['pem_encoded'] == nsx_style_pem.decode('ascii')]
|
||||
if cert['pem_encoded'] == cert_pem]
|
||||
if not cert_ids:
|
||||
raise nsxlib_exc.ResourceNotFound(
|
||||
manager=self.client.nsx_api_managers,
|
||||
|
Loading…
x
Reference in New Issue
Block a user