oc-cdtapi 3.9.4__py3-none-any.whl → 3.9.5__py3-none-any.whl

oc_cdtapi/ForemanAPI.py

@@ -33,12 +33,14 @@ class ForemanAPI(HttpAPI):
         location_id = 5
         hostgroup = 11
         deploy_on = 1
-        self.apiversion = int(os.getenv('FOREMAN_API_VERSION', "1") or "1")
+        self.apiversion = int(os.getenv("FOREMAN_API_VERSION", "1") or "1")
         self.defs = class_defaults(exp_date, location_id, hostgroup, deploy_on)
 
-
     def re(self, req):
-        return posixpath.join(self.root, "api", req)
+        if not req.startswith("foreman_puppet"):
+            return posixpath.join(self.root, "api", req)
+        else:
+            return posixpath.join(self.root, req)
 
     def get_environment(self, env_name):
         """
@@ -498,7 +500,7 @@ class ForemanAPI(HttpAPI):
             return self.puppet_class_info_v1(classname)
         elif self.apiversion == 2:
             logging.debug('Passing to puppet_class_info_v2')
-            return self.puppet_class_info_v1(classname)
+            return self.puppet_class_info_v2(classname)
 
     def puppet_class_info_v1(self, classname):
         """
@@ -513,8 +515,8 @@ class ForemanAPI(HttpAPI):
         Returns puppet class info
         """
         logging.debug('Reached puppet_class_info_v2')
-        logging.debug('Passing to puppet_class_info_v1')
-        return self.puppet_class_info_v1(classname)
+        response = self.get(posixpath.join("foreman_puppet", "api", "puppetclasses", classname), headers=self.headers)
+        return response.json()
 
     def smart_class_info(self, scid):
         """
@@ -598,8 +600,7 @@ class ForemanAPI(HttpAPI):
         Returns info about all hostgroup's puppetclasses
         """
         logging.debug('Reached get_hostgroup_puppetclasses_v2')
-        params = {'hostgroup_id': str(hostgroup_id)}
-        response = self.get('puppetclasses', params=params)
+        response = self.get(posixpath.join('foreman_puppet', 'api', 'hostgroups', str(hostgroup_id), 'puppetclasses'))
         return response.json()
 
     def add_puppet_class_to_host(self, hostname, params):
@@ -626,8 +627,8 @@ class ForemanAPI(HttpAPI):
         Adds the required puppet class to the host
         """
         logging.debug('Reached add_puppet_class_to_host_v2')
-        logging.debug('Passing to add_puppet_class_to_host_v1')
-        self.add_puppet_class_to_host_v1(hostname, params)
+        logging.debug('Params to be sent: %s' % params)
+        response = self.post(posixpath.join('foreman_puppet', 'api', 'hosts', hostname, 'puppetclass_ids'), headers=self.headers, data=params)
 
     def get_subnets(self):
         """

{oc_cdtapi-3.9.4.dist-info → oc_cdtapi-3.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oc-cdtapi
-Version: 3.9.4
+Version: 3.9.5
 Summary: Custom Development python API libraries
 License: Apache2.0
 Requires-Python: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*

{oc_cdtapi-3.9.4.dist-info → oc_cdtapi-3.9.5.dist-info}/RECORD

@@ -2,14 +2,14 @@ oc_cdtapi/API.py,sha256=hpdnzyirYT_wISeznRmoqr-umYRT6uqKVwhmCXyj8Nk,12398
 oc_cdtapi/DevPIAPI.py,sha256=Nn63Ob0kA5XXuRZ3OIWG2rcnSsztKq9yPI6Lu2zX3Gk,1836
 oc_cdtapi/DmsAPI.py,sha256=j2Bx4Sryc4R1knyNjQmZshVuCePeD2q4W-fxv7zOMFc,9481
 oc_cdtapi/DmsGetverAPI.py,sha256=NIhWq2MDWaIBFLYJqkPCV9jZqM1HSZum6gIHquGHdQg,16085
-oc_cdtapi/ForemanAPI.py,sha256=FP_zeCgnSSYTPPck_xD0GsYH5BD0nLiOTiG1Qj4OkO8,39747
+oc_cdtapi/ForemanAPI.py,sha256=w6MN86vJxYtHIZQ5gCehghV0D-EisGpCcBXEvfuUk3M,39986
 oc_cdtapi/JenkinsAPI.py,sha256=lZ8pe3a4eb_6h53JE7QLuzOSlu7Sqatc9PQwWhio9Vg,15748
 oc_cdtapi/NexusAPI.py,sha256=uU12GtHvKlWorFaPAnFcQ5AGEc94MZ5SdmfM2Pw3F7A,26122
 oc_cdtapi/TestServer.py,sha256=HV97UWg2IK4gOYAp9yaMdwFUWsw9v66MxyZdI3qQctA,2715
 oc_cdtapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oc_cdtapi-3.9.4.data/scripts/nexus.py,sha256=4teqZ_KtCSrwHDJVgA7lkreteod4Xt5XJFZNbwb7E6E,6858
-oc_cdtapi-3.9.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-oc_cdtapi-3.9.4.dist-info/METADATA,sha256=lNhBYahN9k9O2JftxqoGLirm50Pca2vWhxxPUz_1y98,276
-oc_cdtapi-3.9.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-oc_cdtapi-3.9.4.dist-info/top_level.txt,sha256=d4-5-D-0CSeSXYuLCP7-nIFCpjkfmJr-Y_muzds8iVU,10
-oc_cdtapi-3.9.4.dist-info/RECORD,,
+oc_cdtapi-3.9.5.data/scripts/nexus.py,sha256=4teqZ_KtCSrwHDJVgA7lkreteod4Xt5XJFZNbwb7E6E,6858
+oc_cdtapi-3.9.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+oc_cdtapi-3.9.5.dist-info/METADATA,sha256=S64Fcjm0kP3W3bg7C5ENxYYtLdkQDKuyi0RVXqrswx8,276
+oc_cdtapi-3.9.5.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+oc_cdtapi-3.9.5.dist-info/top_level.txt,sha256=d4-5-D-0CSeSXYuLCP7-nIFCpjkfmJr-Y_muzds8iVU,10
+oc_cdtapi-3.9.5.dist-info/RECORD,,