From a8e180943aa3bd1692507f5ecd4126b7993202c6 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Wed, 29 Mar 2017 11:27:30 -0400
Subject: Fixed docs. Fixed add_resource.
---
roles/lib_openshift/library/oc_clusterrole.py | 11 ++++++-----
roles/lib_openshift/src/lib/clusterrole.py | 2 +-
roles/lib_openshift/src/lib/rule.py | 9 +++++----
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/roles/lib_openshift/library/oc_clusterrole.py b/roles/lib_openshift/library/oc_clusterrole.py
index b94137d30..8bd8a2ccd 100644
--- a/roles/lib_openshift/library/oc_clusterrole.py
+++ b/roles/lib_openshift/library/oc_clusterrole.py
@@ -1438,6 +1438,7 @@ class Rule(object):
def add_resource(self, inc_resource):
'''add an resource to the resources array'''
+ self.resources.append(inc_resource)
def remove_verb(self, inc_verb):
'''add a verb to the verbs array'''
@@ -1471,10 +1472,10 @@ class Rule(object):
def __eq__(self, other):
'''return whether rules are equal'''
- return self.attribute_restrictions == other.attribute_restrictions and \
- self.api_groups == other.api_groups and \
- self.resources == other.resources and \
- self.verbs == other.verbs
+ return (self.attribute_restrictions == other.attribute_restrictions and
+ self.api_groups == other.api_groups and
+ self.resources == other.resources and
+ self.verbs == other.verbs)
@staticmethod
@@ -1497,7 +1498,7 @@ class Rule(object):
# pylint: disable=too-many-public-methods
class ClusterRole(Yedit):
- ''' Class to model an openshift DeploymentConfig'''
+ ''' Class to model an openshift ClusterRole'''
rules_path = "rules"
def __init__(self, name=None, content=None):
diff --git a/roles/lib_openshift/src/lib/clusterrole.py b/roles/lib_openshift/src/lib/clusterrole.py
index 8207fbc38..93ffababf 100644
--- a/roles/lib_openshift/src/lib/clusterrole.py
+++ b/roles/lib_openshift/src/lib/clusterrole.py
@@ -4,7 +4,7 @@
# pylint: disable=too-many-public-methods
class ClusterRole(Yedit):
- ''' Class to model an openshift DeploymentConfig'''
+ ''' Class to model an openshift ClusterRole'''
rules_path = "rules"
def __init__(self, name=None, content=None):
diff --git a/roles/lib_openshift/src/lib/rule.py b/roles/lib_openshift/src/lib/rule.py
index 628129832..d1e900427 100644
--- a/roles/lib_openshift/src/lib/rule.py
+++ b/roles/lib_openshift/src/lib/rule.py
@@ -90,6 +90,7 @@ class Rule(object):
def add_resource(self, inc_resource):
'''add an resource to the resources array'''
+ self.resources.append(inc_resource)
def remove_verb(self, inc_verb):
'''add a verb to the verbs array'''
@@ -123,10 +124,10 @@ class Rule(object):
def __eq__(self, other):
'''return whether rules are equal'''
- return self.attribute_restrictions == other.attribute_restrictions and \
- self.api_groups == other.api_groups and \
- self.resources == other.resources and \
- self.verbs == other.verbs
+ return (self.attribute_restrictions == other.attribute_restrictions and
+ self.api_groups == other.api_groups and
+ self.resources == other.resources and
+ self.verbs == other.verbs)
@staticmethod
--
cgit v1.2.3