server: fix NPE when router.service.offering is set due to service/disk offering refactoring

[weizhouapache]

Description

This PR fixes NPE by initializing diskOfferingDao.

java.lang.NullPointerException
        at org.cloud.network.router.deployment.RouterDeploymentDefinition.verifyServiceOfferingByUuid(RouterDeploymentDefinition.java:411)
        at org.cloud.network.router.deployment.RouterDeploymentDefinition.findAccountServiceOfferingId(RouterDeploymentDefinition.java:400)
        at org.cloud.network.router.deployment.RouterDeploymentDefinition.findServiceOfferingId(RouterDeploymentDefinition.java:423)
        at org.cloud.network.router.deployment.RouterDeploymentDefinition.executeDeployment(RouterDeploymentDefinition.java:378)
        at org.cloud.network.router.deployment.RouterDeploymentDefinition.findOrDeployVirtualRouter(RouterDeploymentDefinition.java:242)
        at org.cloud.network.router.deployment.RouterDeploymentDefinition.deployVirtualRouter(RouterDeploymentDefinition.java:208)

Types of changes

• Breaking change (fix or feature that would cause existing functionality to change)
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Enhancement (improves an existing feature and functionality)
• Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

• Major
• Minor

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

[weizhouapache]

@blueorangutan package

[blueorangutan]

@weizhouapache a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

[blueorangutan]

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 2883

[nvazquez]

@blueorangutan test

[blueorangutan]

@nvazquez a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

[blueorangutan]

Trillian test result (tid-3612)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32377 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6120-t3612-kvm-centos7.zip
Smoke tests completed. 92 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

[nvazquez]

Code LGTM

[nvazquez]

Not blocking question: what's the reason for these package changes?

[weizhouapache]

@nvazquez
in cloudstack codebase, old java classes are in package com.cloud.xx.xx , new java classes are in package org.apache.cloudstack.xx.xx

these classes are in packages org.cloud.xx.xx which are not correct I think. therefore move to org.apache.cloudstack

[DaanHoogland]

Looks good