[DM] 1. add global-system-config as parent of device-image 2. move jo…

…b.sandesh to fabric-ansible sub project as it is job manager specific

Partial-Bug: #1739812

Change-Id: I569cca4d945a15a77e03e0158c67a57c6a7680a3

src/config/uve/job.sandesh → src/config/fabric-ansible/job.sandesh

@@ -14,6 +14,7 @@
  * UVE that stores the device info from device discovery or device resync. 
  */
 struct PRouterOnboardingLogEntry {
+    /* PRouter fq_name as string joined by ':', e.g. domain-1:project-1:mx240-1. */
     1: string                           name (key="ObjectPRouter");
     2: i64                              timestamp;
     /* Installed software image version */
@@ -33,8 +34,8 @@ struct PRouterOnboardingLogEntry {
  * object log for the job execution
  */
 struct JobLogEntry {
-    /* Unique id that identifies a job template */
-    1: string                           job_id (key="ObjectJobTemplate");
+    /* job template fq_name as string joined by ':', e.g. domain-1:project-1:job-template-1. */
+    1: string                           name (key="ObjectJobTemplate");
     /* Unique id that identifies a job execution */
     2: string                           execution_id (key="JobExecution");
     /* Job log timestamp */
@@ -55,8 +56,8 @@ struct JobLogEntry {
  * UVE that tracks a job execution. This UVE is created when job is started and destroyed when job completes.
  */
 struct JobExecution {
-    /* Unique id that identifies a job template */
-    1: string                           job_id (key="ObjectJobTemplate");
+    /* job template fq_name as string joined by ':', e.g. domain-1:project-1:job-template-1. */
+    1: string                           name (key="ObjectJobTemplate");
     /* Unique id that identifies a job execution */
     2: string                           execution_id (key="JobExecution");
     3: optional bool                    deleted

src/config/uve/SConscript

@@ -19,4 +19,3 @@ SandeshGenPyFiles += env.SandeshGenPy('msg_traces.sandesh')
 SandeshGenPyFiles += env.SandeshGenPy('config_req.sandesh')
 SandeshGenPyFiles += env.SandeshGenPy('physical_router_config.sandesh')
 SandeshGenPyFiles += env.SandeshGenPy('service_status.sandesh')
-SandeshGenPyFiles += env.SandeshGenPy('job.sandesh')

src/schema/vnc_cfg.xsd

@@ -2233,6 +2233,13 @@ targetNamespace="http://www.contrailsystems.com/2012/VNC-CONFIG/0">
 </xsd:complexType>
 
 <xsd:element name="device-image" type="ifmap:IdentityType"/>
+
+<xsd:element name="global-system-config-device-image"/>
+<!--#IFMAP-SEMANTICS-IDL
+     Link('global-system-config-device-image',
+             'global-system-config', 'device-image', ['has'], 'optional', 'CRUD',
+             'list of device image info for the images that get uploaded to the system.') -->
+
 <xsd:element name="device-image-vendor-name" type="xsd:string"/>
 <!--#IFMAP-SEMANTICS-IDL
      Property('device-image-vendor-name', 'device-image', 'required', 'CRUD',