Skip to content

Commit 641e236

Browse files
committed
fix: removed registerType RPC call
1 parent 3bb6ac8 commit 641e236

File tree

3 files changed

+0
-46
lines changed

3 files changed

+0
-46
lines changed

src/DIRAC/AccountingSystem/Client/AccountingCLI.py

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -57,37 +57,6 @@ def showTraceback(self):
5757
traceback.print_tb(sys.exc_info()[2])
5858
print("________________________\n")
5959

60-
def do_registerType(self, args):
61-
"""
62-
Registers a new accounting type
63-
Usage : registerType <typeName>
64-
<DIRACRoot>/DIRAC/AccountingSystem/Client/Types/<typeName>
65-
should exist and inherit the base type
66-
"""
67-
try:
68-
argList = args.split()
69-
if argList:
70-
typeName = argList[0].strip()
71-
else:
72-
gLogger.error("No type name specified")
73-
return
74-
# Try to import the type
75-
result = self.objectLoader.loadObject(f"DIRAC.AccountingSystem.Client.Types.{typeName}")
76-
if not result["OK"]:
77-
return result
78-
typeClass = result["Value"]
79-
80-
gLogger.info(f"Loaded type {typeClass.__name__}")
81-
typeDef = typeClass().getDefinition()
82-
acClient = DataStoreClient()
83-
retVal = acClient.registerType(*typeDef)
84-
if retVal["OK"]:
85-
gLogger.info("Type registered successfully")
86-
else:
87-
gLogger.error(f"Error: {retVal['Message']}")
88-
except Exception:
89-
self.showTraceback()
90-
9160
def do_resetBucketLength(self, args):
9261
"""
9362
Set the bucket Length. Will trigger a recalculation of buckets. Can take a while.

src/DIRAC/AccountingSystem/Client/Types/BaseAccountingType.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,6 @@ def getContents(self):
161161
cD[self.fieldsList[iPos]] = self.valuesList[iPos]
162162
return cD
163163

164-
def registerToServer(self):
165-
"""
166-
Register type in server
167-
"""
168-
rpcClient = Client(url="Accounting/DataStore")
169-
return rpcClient.registerType(*self.getDefinition())
170-
171164
def commit(self):
172165
"""
173166
Commit register to server

src/DIRAC/AccountingSystem/Service/DataStoreHandler.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@ def initializeHandler(cls, svcInfoDict):
3939
gThreadScheduler.addPeriodicTask(60, cls.__acDB.loadPendingRecords)
4040
return S_OK()
4141

42-
types_registerType = [str, list, list, list]
43-
44-
def export_registerType(self, typeName, definitionKeyFields, definitionAccountingFields, bucketsLength):
45-
"""
46-
Register a new type. (Only for all powerful admins)
47-
"""
48-
return self.__acDB.registerType(typeName, definitionKeyFields, definitionAccountingFields, bucketsLength)
49-
5042
types_setBucketsLength = [str, list]
5143

5244
def export_setBucketsLength(self, typeName, bucketsLength):

0 commit comments

Comments
 (0)