slapos.package.promise: No Plurals

slapos/package/promise/__init__.py

@@ -30,13 +30,13 @@
 
 import core
 import hostname
-import limits
+import limitconf
 import slappkgcron
 
 promise_list = (
   core.Promise,
   hostname.Promise,
   slappkgcron.Promise,
-  limits.Promise
+  limitconf.Promise
  )
 

slapos/package/promise/limits.py

-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2012-2014 Vifib SARL and Contributors.
-# All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly advised to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from slapos.package.base_promise import BasePromise
-import os
-import pkg_resources
-
-
-class Promise(BasePromise):
-
-  configuration_file_path = '/etc/security/limits.conf' 
-
-  def _getLimitsTemplate(self):
-    return pkg_resources.resource_stream(__name__,
-                         'template/limits.conf.in').read()
-
-  def checkConsistency(self, fixit=0, **kw):
-    is_ok = False
-
-    if os.path.exists(self.configuration_file_path):
-       expected_limit = self._getLimitsTemplate()
-       with open(self.configuration_file_path, 'r') as limits_conf:
-         is_ok = expected_limit == limits_conf.read()
-
-    if not is_ok and fixit:
-      return self.fixConsistency(**kw)
-
-    return is_ok
-
-  def fixConsistency(self, **kw):
-    """Configures hostname daemon"""
-
-    self.log("Update limits : %s" % self.configuration_file_path)
-    if os.path.exists(self.configuration_file_path):
-      shutil.copy(self.configuration_file_path, 
-        "%s.%s" % (self.configuration_file_path, time.time()))
-    
-    with open(self.configuration_file_path, 'w') as limits_conf:
-      limits_conf.write(self._getLimitsTemplate())
-
-    return self.checkConsistency(fixit=0, **kw)
-

slapos/package/test/test_promise_limit.py

@@ -27,7 +27,7 @@
 #
 ##############################################################################
 
-from slapos.package.promise import limits
+from slapos.package.promise import limitconf
 import os
 import pkg_resources
 import unittest
@@ -35,15 +35,15 @@ import unittest
 def _fake_call(self, *args, **kw):
   self.last_call = (args, kw)
 
-class testLimitsTestCase(unittest.TestCase):
+class testLimitConfTestCase(unittest.TestCase):
 
   def setUp(self):
-    limits.Promise._call = _fake_call
+    limitconf.Promise._call = _fake_call
     if os.path.exists("/tmp/test_promise_testing_limits.conf"):
       os.remove("/tmp/test_promise_testing_limits.conf")
 
-  def testLimitsCheckConsistency(self):
-    promise = limits.Promise()
+  def testLimitConfCheckConsistency(self):
+    promise = limitconf.Promise()
     promise.configuration_file_path = "/tmp/test_promise_testing_limits.conf"
 
     self.assertFalse(promise.checkConsistency())
@@ -52,9 +52,9 @@ class testLimitsTestCase(unittest.TestCase):
 
     self.assertFalse(promise.checkConsistency())
 
-  def testLimitsFixConsistency(self):
-    limits.Promise._call = _fake_call
-    promise = limits.Promise()
+  def testLimitConfFixConsistency(self):
+    limitconf.Promise._call = _fake_call
+    promise = limitconf.Promise()
     promise.configuration_file_path = "/tmp/test_promise_testing_limits.conf"
 
     self.assertFalse(promise.checkConsistency())
@@ -63,5 +63,5 @@ class testLimitsTestCase(unittest.TestCase):
 
     self.assertTrue(os.path.exists(promise.configuration_file_path))
     limit_content = open(promise.configuration_file_path, "r").read()
-    self.assertEquals(limit_content, pkg_resources.resource_stream(limits.__name__,
+    self.assertEquals(limit_content, pkg_resources.resource_stream(limitconf.__name__,
                                              'template/limits.conf.in').read())