Updated register-pegasus script to generate better ProviderModuleName.

The PG_ProviderModule.ProviderModuleName is now taken from 'group:' field from
sfcbd .reg file. This makes sure that various Python providers, which use the
same libpyCmpiProvider.so, have different PG_ProviderModule.

1 files changed, 18 insertions, 14 deletions

diff --git a/openlmi-register-pegasus b/openlmi-register-pegasus
index 1830ec3..d314d27 100755
--- a/openlmi-register-pegasus
+++ b/openlmi-register-pegasus
@@ -26,7 +26,8 @@ reg_parse = re.compile(r"\[([^\]]+)\]\s+"
 "provider: ([^\s]+)\s+"
 "location: (\w+)\s+"
 "type: ([^\n]+)\s+"
-"namespace: ([^\n]+)")
+"namespace: ([^\n]+)\s+"
+"(group: ([^\n]+)|)") # the group is optional
 
 Types = {
     'instance': '2',
@@ -37,18 +38,18 @@ Types = {
     'instanceQuery': '7'
 }
 
-def define_module(location):
+def define_module(location, group):
     return """instance of PG_ProviderModule
 {
-    Name = "%(location)s";
+    Name = "%(group)s";
     Location = "%(location)s";
     Vendor = "OpenLMI";
     Version = "0.0.1";
     InterfaceType = "CMPI";
     InterfaceVersion = "2.0.0";
-    ModuleGroupName = "%(location)s";
+    ModuleGroupName = "%(group)s";
 };
-""" % { 'location': location }
+""" % { 'location': location, 'group': group }
 
 def getTypes(types):
     l = []
@@ -57,16 +58,16 @@ def getTypes(types):
             l.append(value)
     return ",".join(l)
 
-def define_capability(location, provider, cls, types):
+def define_capability(location, provider, cls, types, group):
     return """instance of PG_Provider
 {
     Name = "%(provider)s";
-    ProviderModuleName = "%(location)s";
+    ProviderModuleName = "%(group)s";
 };
 
 instance of PG_ProviderCapabilities
 {
-   ProviderModuleName = "%(location)s";
+   ProviderModuleName = "%(group)s";
    ProviderName = "%(provider)s";
    CapabilityID = "%(class)s";
    ClassName = "%(class)s";
@@ -75,14 +76,17 @@ instance of PG_ProviderCapabilities
    SupportedProperties = NULL;
    SupportedMethods = NULL;
 };
-""" % { 'location': location, 'provider': provider, 'class': cls, 'types': getTypes(types) }
+""" % { 'location': location, 'provider': provider, 'class': cls, 'types': getTypes(types), 'group': group }
 
 modules_defined = {}
 for record in reg_parse.findall(sys.stdin.read()):
-    cls, provider, location, types, namespace = record
+    cls, provider, location, types, namespace, _unused, group = record
 
-    if location not in modules_defined:
-        print define_module(location)
-        modules_defined[location] = True
+    if not group:
+        group = location
 
-    print define_capability(location, provider, cls, types)
+    if group not in modules_defined:
+        print define_module(location, group)
+        modules_defined[group] = True
+
+    print define_capability(location, provider, cls, types, group)