search

xcat2 / xcat-inventory

An inventory tool for xcat cluster
8 stars 16 forks source link

support prodkey as a subobject for node #151

Closed immarvin closed 6 years ago

immarvin commented 6 years ago

fix https://github.com/xcat2/xcat-inventory/issues/152

currently, the prodkey is a table with multiple primary keys, refine the schema of node object to include security_info:productkey as a subject of prodkey

UT:

[root@c910f03c01p13 inventory]# tabdump prodkey
#node,product,key,comments,disable
"bogusnode","os","productkey",,
"bogusnode","product1","productkey",,
[root@c910f03c01p13 inventory]# xcat-inventory export -t node -o bogusnode
node:
  bogusnode:
    deprecated:
      cfgmgtcfgmgr: cfgmgr
      cfgmgtcfgserver: cfgserver
      cfgmgtroles: cfgmgtroles
      chainondiscover: ondiscover
      hypervisorcluster: hostcluster
      hypervisorinterface: hostinterface
      hypervisormgr: hostmanager
      hypervisortype: hosttype
      iscsipasswd: iscsipassword
      iscsiserver: iscsiserver
      iscsitarget: iscsitarget
      iscsiuserid: iscsiuserid
      macinterface: interface
      nodehmcmdmapping: cmdmapping
      nodehmgetmac: getmac
      nodelisthidden: hidden
      noderesnfsdir: nfsdir
      noderesnimserver: nimserver
      noderesprimarynic: primarynic
      noderesproxydhcp: supportproxydhcp
      servicenodeftpserver: setupftp
      servicenodenimserver: setupnim
      storagecontroller: storagcontroller
      storageosvolume: osvolume
      storagetype: storagetype
      tftpdir: tftpdir
      vmmigrationdest: migrationdest
      vmtextconsole: vmtextconsole
      vpdside: side
    device_info:
      arch: ppc64
      characteristics: ppc,osi
      cpucount: cpucount
      cputype: cputype
      disksize: disksize
      memory: memory
      mtm: mtm
      serial: serial
      supportedarchs: supportedarchs
    device_type: hmc
    domain_info:
      adminpassword: domainadminpassword
      adminuser: domainadminuser
      authdomain: authdomain
      ou: ou
      type: domaintype
    engines:
      console_engine:
        engine_info:
          conserver: conserver
          consoleondemand: consoleondemand
          serialflow: serialflow
          serialport: serialport
          serialspeed: serialspeed
          terminalport: termport
          terminalserver: termserver
        engine_type: cons
      hardware_mgt_engine:
        engine_info:
          hcp: HMC
          hwtype: hwtype
          id: '5'
          mpa: mpa
          parent: parent
          pprofile: pprofile
          sfp: sfp
          supernode: supernode
          vmbeacon: vmbeacon
          vmbootorder: vmbootorder
          vmcfgstore: vmcfgstore
          vmcluster: vmcluster
          vmmanager: vmmanager
          vmmaster: vmmaster
          vmnicnicmodel: vmnicnicmodel
          vmphyslots: vmphyslots
          vmstorage: vmstorage
          vmstoragecache: vmstoragecache
          vmstorageformat: vmstorageformat
          vmstoragemodel: vmstoragemodel
          vmtextconsole: vmstorageformat
          vmvirtflags: vmvirtflags
          vmvncport: vmvncport
        engine_type: hmc
      netboot_engine:
        engine_info:
          addkcmdline: addkcmdline
          chain: chain
          installnic: installnic
          osimage: provmethod
          postbootscripts: postbootscripts
          postscripts: postscripts
          prescriptsbegin: prescripts-begin
          prescriptsend: prescripts-end
        engine_type: grub2
      power_mgt_engine:
        engine_info:
          pdu: pdu
        engine_type: power
    network_info:
      connections:
        interface: switchinterface
        switch: switch
        switchport: '50'
        vlan: switchvlan
      nics:
        bond0:
          nicdevices:
          - eth0
          - eth2
        br0:
          nicdevices:
          - bond0
        enP3p3s0f1:
          nicsinfo:
          - mac=98:be:94:59:fa:cd linkstate=DOWN
        enP3p3s0f2:
          nicsinfo:
          - mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face
        enP48p1s0f0:
          ips:
          - 129.40.234.11
          networks:
          - pub_yellow
          type:
          - Ethernet
        enP48p1s0f1:
          networks:
          - xcat_util
          type:
          - unused
        enP5p1s0f1:
          networks:
          - xcat_compute
          type:
          - unused
        enP5p1s0f1.4:
          networks:
          - xcat_bmc
          type:
          - unused
        enP5p1s0f1.5:
          networks:
          - xcat_infra
          type:
          - unused
        enP5p1s0f1.6:
          networks:
          - xcat_pdu
          type:
          - unused
        eth0:
          alias:
          - moe larry curly
          configscripts:
          - configeth eth0
          extraconfig:
          - MTU=1500
          hostnameprefixe:
          - eth0-
          hostnamesuffixes:
          - -eth0
        eth1:
          alias:
          - tom
          - jerry
        ib0:
          configscripts:
          - configib ib0
          extraconfig:
          - MTU=65520 CONNECTED_MODE=yes
          hostnameprefixe:
          - ib-
          hostnamesuffixes:
          - -ib0
          ips:
          - 10.10.100.9
          networks:
          - IB00
          type:
          - Infiniband
        ib1:
          ips:
          - 10.11.100.9
          networks:
          - IB01
          type:
          - Infiniband
        ib2:
          networks:
          - IB02
          type:
          - unused
        ib3:
          networks:
          - IB03
          type:
          - unused
      otherinterfaces: otherinterfaces
      primarynic:
        hostnames: hostnames
        ip: 10.10.10.10
        mac:
        - 42:d6:0a:03:05:08
      routenames: routenames
    obj_info:
      description: usercomment
      groups: bogusgroup
    obj_type: node
    position_info:
      chassis: chassis
      height: height
      rack: rack
      room: room
      slot: slot
      unit: unit
    role: service
    role_info:
      dhcpinterfaces: dhcpinterfaces
      enablesyslog: syslog
      monserver: monserver
      nameservers: nameservers
      nfsserver: nfsserver
      nodelistprimarysn: primarysn
      servicenode: servicenode
      setupconserver: '0'
      setupdhcp: '0'
      setupipforward: '0'
      setupldap: '0'
      setupnameserver: '0'
      setupnfs: '0'
      setupntp: '0'
      setupproxydhcp: '0'
      setuptftp: '0'
      tftpserver: tftpserver
      xcatmaster: xcatmaster
    security_info:
      productkey:
      - key: productkey
        product: os
      - key: productkey
        product: product1
      remotecontrol:
        password: password
        username: username
      zonename: zonename
schema_version: '2.0'

#Version 2.14.5 (git commit 4042193c2100b874d58c9e85c7d35ad9bbd8f135, built Mon Nov  5 06:16:43 EST 2018)
[root@c910f03c01p13 inventory]#
bybai commented 6 years ago

I am OK to merge it.