oslcquery: fixed problem with ETM opt-out projects not working

Author: barny

elmclient/_qm.py

@@ -50,31 +50,8 @@ def load_components_and_configurations(self,force=False):
         nconfs = 0
         # retrieve components and configurations for this project
         if not self.is_optin:
-            logger.debug( f"{self.is_optin=}" )
-            # get the default configuration
-            projx = self.execute_get_xml( self.reluri( 'rm-projects/' + self.iid ), intent="Retrieve the project definition (opt-out)" )
-            compsu = rdfxml.xmlrdf_get_resource_text( projx, './/jp06:components' )
-            compsx = self.execute_get_xml(compsu, intent="Retrieve the component definition (opt-out)" )
-            defaultcompu = rdfxml.xmlrdf_get_resource_uri( compsx, './/oslc_config:component' )
-            
-            # register the only component
-            ncomps += 1
-            self._components[defaultcompu] = {'name': self.name, 'configurations': {}}
-            thisconfu = defaultcompu+"/configurations"
-            configs = self.execute_get_json( thisconfu, intent="Retrieve all configurations (opt-out)" )
-            configdetails = configs[defaultcompu+"/configurations"]
-            if type(configs[thisconfu]["http://www.w3.org/2000/01/rdf-schema#member"])==dict:
-                confs = [configs[thisconfu]["http://www.w3.org/2000/01/rdf-schema#member"]]
-            else:
-                confs = configs[thisconfu]["http://www.w3.org/2000/01/rdf-schema#member"]
-            for aconf in confs:
-                confu = aconf['value']
-                confx = self.execute_get_xml( confu, intent="Retrieve configuration definition (opt-out)" )
-                conftitle = rdfxml.xmlrdf_get_resource_text(confx,'.//dcterms:title')
-                conftype = 'Stream' if 'stream' in confu else 'Baseline'
-                self._components[defaultcompu]['configurations'][confu] = {'name': conftitle, 'conftype': conftype, 'confXml': confx}
-                self._configurations[defaultcompu] = self._components[defaultcompu]['configurations'][confu]
-                nconfs += 1
+            # for QM, no configs to load!
+            return
         elif self.singlemode:
             logger.debug( f"{self.singlemode=}" )
             #get the single component from a QueryCapability
@@ -123,9 +100,11 @@ def load_components_and_configurations(self,force=False):
 
             components_uri = rdfxml.xmlrdf_get_resource_uri(cmsp_xml, './/rdf:Description/rdf:type[@rdf:resource="http://open-services.net/ns/core#QueryCapability"]/../oslc:resourceType[@rdf:resource="http://open-services.net/ns/config#Component"]/../oslc:queryBase')
             logger.info( f"{components_uri=}" )
+            print( f"{components_uri=}" )
             # get all components
             crx = self.execute_get_xml( components_uri, intent="Retrieve component definition" )
-
+            logger.info( f"{crx=}" )
+            print( f"{crx=}" )
 #      <oslc_config:Component rdf:about="https://jazz.ibm.com:9443/qm/oslc_config/resources/com.ibm.team.vvc.Component/_iw4s4EB3Eeus6Zk4qsm_Cw">
 #        <dcterms:title rdf:parseType="Literal">SGC Agile</dcterms:title>
 #        <oslc:instanceShape rdf:resource="https://jazz.ibm.com:9443/qm/oslc_config/resourceShapes/com.ibm.team.vvc.Component"/>
@@ -226,11 +205,14 @@ def get_local_component_details(self):
         return results
 
     def find_local_component(self, name_or_uri):
-        self.load_components_and_configurations()
-        for compuri, compdetail in self._components.items():
-            logger.info( f"Checking {name_or_uri} {compdetail}" )
-            if compuri == name_or_uri or compdetail['name'] == name_or_uri:
-                return compdetail['component']
+        if self.is_optin:
+            self.load_components_and_configurations()
+            for compuri, compdetail in self._components.items():
+                logger.info( f"Checking {name_or_uri} {compdetail}" )
+                if compuri == name_or_uri or compdetail['name'] == name_or_uri:
+                    return compdetail['component']
+        else:
+            return self
         return None
 
     def _create_component_api(self, component_prj_url, component_name):

elmclient/examples/oslcquery.py

@@ -511,25 +511,44 @@ def safeint(s,nonereturns=0):
 
     print( f"Query result has {len(results.keys())} {resultsentries}" )
 
-    # THIS IS UNTESTED!
+    # COMPARE IS UNTESTED!
     if args.outputfile or args.compareresults:
         # write to CSV and/or compare with CSV
+        # FIRST merge columns with same name - this merges types across components based on name
+        # which is only need for queries in a GC. NOTE this doesn't attempt to use RDF URIs which it probably should :-o
+        # but having different (as in totally different) types with same name is not exactly human-friendly!
         # build a list of all properties - these will be column headings for the CSV
         headings = []
+        rawheadings = [] # this is used so headings are only resolved once - the raw headings are remembered in this list
+        actualheadings = {}
         for k, v in list(results.items()):
             # add the URI to the value so it will be exported (first char is $ so the uri will always be in first column after the column titles are sorted)
             v["$uri"] = k
             for sk in list(v.keys()):
-                sk1 = queryon.resolve_uri_to_name(sk)
-                if sk1 is not None:
+                sk1 = queryon.resolve_uri_to_name(sk) if args.resolvenames else sk
+                if sk not in rawheadings:
+                    rawheadings.append(sk)
+                    if sk1 == sk: # if heading name hasn't been resolved before
+                        sk1 = queryon.resolve_uri_to_name(sk) # always resolve - only for headings
+                    if sk1 not in headings:
+                        headings.append(sk1)
+                    actualheadings[sk] = sk1
+#                    # also store the reverse actual->raw
+#                    actualheadings[sk1] = sk
+                    logger.info( f"Mapping {sk} to {sk1}" )
+                else:
+                    sk1 = actualheadings[sk]
+                if sk!=sk1:
                     logger.debug(f"renaming {sk=} {sk1=}" )
+                    # if ernaming need to merge column content!
                     existing = v[sk]
+                    otherexisting = v.get(sk1)
                     del v[sk]
-                    v[sk1] = existing
-                else:
-                    sk1 = sk
-                if sk1 not in headings:
-                    headings.append(sk1)
+                    if existing and otherexisting:
+                        if existing != otherexisting:
+                            logger.info( f"MERGE {existing=} {otherexisting=}" )
+                            burp
+                    v[sk1] = otherexisting if otherexisting else existing
 
         fieldnames = sorted(headings)
         if args.outputfile: