Fixed problem with configuraiton headers needed when GCM isn't installed

Author: barny

elmclient/_newtypesystem.py

@@ -285,7 +285,7 @@ def load_ot( self, serverconnection, url, iscacheable=True, isused=False ):
             print( f"OT definition for {url} already present!" )
             return
         # get the URI and process all the attributes
-        content_x = serverconnection.execute_get_xml( url, params={'oslc_config.context':serverconnection.local_config},headers={'Configuration-Context': None},  cacheable=iscacheable )
+        content_x = serverconnection.execute_get_xml( url, params={'vvc.configuration':serverconnection.local_config},headers={'Configuration-Context': None},  cacheable=iscacheable )
         if content_x is None:
             burp
         modified = rdfxml.xmlrdf_get_resource_uri( content_x,'.//dcterms:modified', exceptionifnotfound=True )
@@ -313,7 +313,7 @@ def load_ad( self, serverconnection, url, iscacheable=True, isused=False ):
 #            print( f"AD definition for {url} already present!" )
             return
         # get the URI and process all the attributes
-        content_x = serverconnection.execute_get_xml( url, params={'oslc_config.context':serverconnection.local_config},headers={'Configuration-Context': None}, cacheable=iscacheable )
+        content_x = serverconnection.execute_get_xml( url, params={'vvc.configuration':serverconnection.local_config},headers={'Configuration-Context': None}, cacheable=iscacheable )
         if content_x is None:
             burp
         modified = rdfxml.xmlrdf_get_resource_uri( content_x,'.//dcterms:modified', exceptionifnotfound=True )
@@ -340,7 +340,7 @@ def load_at( self, serverconnection, url, iscacheable=True, isused=False ):
         if not serverconnection.app.is_server_uri( url ):
 #            print( f"AT Ignoring non-server URL {url}" )
             return
-        content_x = serverconnection.execute_get_xml( url, params={'oslc_config.context':serverconnection.local_config},headers={'Configuration-Context': None}, cacheable=iscacheable )
+        content_x = serverconnection.execute_get_xml( url, params={'vvc.configuration':serverconnection.local_config},headers={'Configuration-Context': None}, cacheable=iscacheable )
         if content_x is None:
             burp
         modified = rdfxml.xmlrdf_get_resource_uri( content_x,'.//dcterms:modified', exceptionifnotfound=True )
@@ -386,7 +386,7 @@ def load_lt( self, serverconnection, url, iscacheable=True, isused=False ):
         if url in self.lts:
 #            print( f"LT definition for {url} already present!" )
             return
-        content_x = serverconnection.execute_get_xml( url, params={'oslc_config.context':serverconnection.local_config},headers={'Configuration-Context': None}, cacheable=iscacheable )
+        content_x = serverconnection.execute_get_xml( url, params={'vvc.configuration':serverconnection.local_config},headers={'Configuration-Context': None}, cacheable=iscacheable )
         if content_x is None:
             burp
         modified = rdfxml.xmlrdf_get_resource_uri( content_x,'.//dcterms:modified', exceptionifnotfound=True )

elmclient/_rm.py

@@ -1494,7 +1494,7 @@ def process_represt_arguments( self, args, allapps ):
         gcconfiguri = None
         gcapp = allapps.get('gc',None)
         if not gcapp and args.globalconfiguration:
-            raise Exception( "gc app must be specified in APPSTRINGS/-A (after the rm app) to use a global configuration - for exmaple use -A rm,gc" )
+            raise Exception( "gc app must be specified in APPSTRINGS/-A, after the rm app, to use a global configuration - for exmaple use -A rm,gc" )
 
         # most queries need a project and configuration - projects queried without a config will return data from the default configuraiotn (the default component's initial stream)
         if args.all or args.collection or args.module or args.view or args.typename or args.resourceID or args.moduleResourceID or args.coreResourceID or args.schema or args.attributes or args.titles or args.linksOnly or args.history or args.artifact_format=='views':
@@ -1541,7 +1541,7 @@ def process_represt_arguments( self, args, allapps ):
 
                         # get the query capability base URL
                         qcbase = gc_query_on.get_query_capability_uri("oslc_config:Configuration")
-                        # query for a configuration with title
+                        # query gcm for a configuration with title
                         print( f"querying for gc config {args.globalconfiguration}" )
                         conf = gc_query_on.execute_oslc_query( qcbase, whereterms=[['dcterms:title','=',f'"{args.globalconfiguration}"']], select=['*'], prefixes={rdfxml.RDF_DEFAULT_PREFIX["dcterms"]:'dcterms'})
                         if len( conf.keys() ) == 0:
@@ -1551,7 +1551,7 @@ def process_represt_arguments( self, args, allapps ):
                         gcconfiguri = list(conf.keys())[0]
                         logger.info( f"{gcconfiguri=}" )
                         logger.debug( f"{gcconfiguri=}" )
-                        queryparams['oslc_config.context'] = gcconfiguri
+                        queryparams['oslc_config.context'] = gcconfiguri # a GC configuration
 
                 # check the gc config uri exists - a GET from it shouldn't fail!
                 if not gcapp.check_valid_config_uri(gcconfiguri,raise_exception=False):
@@ -1597,15 +1597,23 @@ def process_represt_arguments( self, args, allapps ):
                     queryparams['targetConfigUri'] = targetconfig
                     queryparams['sourceConfigUri'] = config
             else:
+                # opt-out
+                gcconfiguri = None
                 if not args.localconfiguration:
                     args.localconfiguration = f"{args.project} Initial Stream"
                 config = p.get_local_config(args.localconfiguration)
                 queryon=p
             queryon.set_local_config(config,gcconfiguri)
-            queryparams['oslc_config.context'] = config or gcconfiguri
+            if gcconfiguri:
+                queryparams['oslc_config.context'] = gcconfiguri
+            else:
+                queryparams['vvc.configuration'] = config
         if args.artifact_format=='comparison' and args.targetconfiguration:
+            # remove any configuration parameters!
             if 'oslc_config.context' in queryparams:
                 del queryparams['oslc_config.context']
+            if 'vvc.configuration' in queryparams:
+                del queryparams['vvc.configuration']
 
         if args.module:
             # get the query capability base URL for requirements

elmclient/examples/batchquery.py

@@ -214,7 +214,7 @@ def do_tests(inputargs=None):
                         print( f"Stopping after first failure, {rep} repetitions" )
                         return
             else:
-                print( f"Test {testnumber} passed!" )
+                print( f"Test {testnumber} passed! (Failed={nfailed})" )
                 npassed += 1
 
     if not args.dryrun: