aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitreview2
-rw-r--r--ncomp-openstack-controller/.classpath2
-rw-r--r--ncomp-openstack-controller/META-INF/MANIFEST.MF7
-rw-r--r--ncomp-openstack-controller/pom.xml2
-rw-r--r--ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/openstack/controller/tools/Generator.java4
-rw-r--r--ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerProvider.java13
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/OpenStackController.yaml12
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/OpenStackLocation.yaml288
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackController.java28
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerClient.java16
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerServer.java24
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/OsOpenStackLocation.java292
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/OsOpenStackLocationClient.java280
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocation.properties194
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocationMessageEnum.java119
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocationOperationEnum.java106
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptor.properties2
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptorMessageEnum.java23
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptorOperationEnum.java36
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackController.properties10
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackControllerMessageEnum.java27
-rw-r--r--ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackControllerOperationEnum.java37
-rw-r--r--ncomp-openstack-feature/.project17
-rw-r--r--ncomp-openstack-feature/LICENSE.txt22
-rw-r--r--ncomp-openstack-model/META-INF/MANIFEST.MF6
-rw-r--r--ncomp-openstack-model/pom.xml2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/OpenStackController.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/OpenstackPackage.java18
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerAlarm.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerFilter.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerOrderedBy.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerPackage.java18
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerProject.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerQuery.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerResource.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerSample.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerService.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerThresholdAlarm.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerThresholdAlarmRule.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/SampleRequest.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerAlarmImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerFilterImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerMeterImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerOrderedByImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerProjectImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerQueryImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerRequestImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerResourceImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerSampleImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerServiceImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerThresholdAlarmImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerThresholdAlarmRuleImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CreateAlarmRequestImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/SampleRequestImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/util/CeilometerSwitch.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Address.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Addresses.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/ComputePackage.java18
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Fault.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Flavor.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/FloatingIp.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Image.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/KeyPair.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Link.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Metadata.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestFlavor.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestKeyPair.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestNewServer.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestSecurityGroup.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestServerAction.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Personality.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Reference.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityGroup.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityRange.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityRule.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Server.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Volume.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/VolumeAttachment.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/AddressImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/AddressesImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ComputeServiceImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FaultImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FlavorImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FloatingIpImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ImageImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/KeyPairImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/LinkImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/MetadataImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestFlavorImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestKeyPairImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestNewServerImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestPollImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestSecurityGroupImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestServerActionImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/PersonalityImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ReferenceImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityGroupImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityRangeImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityRuleImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ServerImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/VolumeAttachmentImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/VolumeImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/util/ComputeSwitch.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/CorePackage.java18
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/OpenStackRequest.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/OpenstackRequestDelete.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/SecurityRule.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/SecurityRuleProtocol.java6
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/VirtualMachineType.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenStackRequestImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenstackRequestDeleteImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenstackRequestPollImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/SecurityRuleImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/VirtualMachineTypeImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/util/CoreSwitch.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/impl/OpenStackControllerImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/Hypervisor.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuInfo.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuTopology.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorService.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/LocationPackage.java18
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackLocation.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackProject.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackUser.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackVersion.java6
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuInfoImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuTopologyImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorServiceImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackLocationImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackProjectImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackUserImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/util/LocationSwitch.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/AllocationPool.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/BindingVifDetail.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateNetworkRequest.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreatePortRequest.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateRouterRequest.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateSubnetRequest.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/ExternalGateway.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/FixedIp.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Network.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronFloatingIp.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronPackage.java18
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronSecurityGroup.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronSecurityRule.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Port.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Router.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Subnet.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/AllocationPoolImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/BindingProfileImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/BindingVifDetailImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateNetworkRequestImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreatePortRequestImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateRouterRequestImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateSubnetRequestImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/ExternalGatewayImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/FixedIpImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NetworkImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronFloatingIpImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronObjectImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronRequestImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronSecurityGroupImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronSecurityRuleImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronServiceImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/PortImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/RouterImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/SubnetImpl.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/util/NeutronSwitch.java2
-rw-r--r--ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/util/OpenstackSwitch.java2
-rw-r--r--pom.xml10
-rw-r--r--version.properties2
172 files changed, 978 insertions, 997 deletions
diff --git a/.gitreview b/.gitreview
index 34590c6..dfff243 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
[gerrit]
-host=gerrit.openecomp.org
+host=gerrit.onap.org
port=29418
project=ncomp/openstack.git
diff --git a/ncomp-openstack-controller/.classpath b/ncomp-openstack-controller/.classpath
index fda728c..15a18db 100644
--- a/ncomp-openstack-controller/.classpath
+++ b/ncomp-openstack-controller/.classpath
@@ -20,8 +20,6 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
- <classpathentry combineaccessrules="false" kind="src" path="/ncomp-sirius-manager-drools"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/ncomp-openstack-controller/META-INF/MANIFEST.MF b/ncomp-openstack-controller/META-INF/MANIFEST.MF
index 932b68c..86c63c1 100644
--- a/ncomp-openstack-controller/META-INF/MANIFEST.MF
+++ b/ncomp-openstack-controller/META-INF/MANIFEST.MF
@@ -6,10 +6,3 @@ Bundle-Version: 0.1.0.qualifier
Export-Package: org.openecomp.ncomp.openstack.controller.tools,
org.openecomp.ncomp.servers.openstack,
org.openecomp.ncomp.servers.openstack.loc
-Require-Bundle: ncomp-core-types;bundle-version="0.1.0",
- ncomp-sirius-manager-model;bundle-version="0.1.0",
- ncomp-sirius-manager-server;bundle-version="0.1.0",
- ncomp-sirius-manager-console;bundle-version="0.1.0",
- ncomp-sirius-manager-generator;bundle-version="0.1.0",
- ncomp-openstack-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0"
diff --git a/ncomp-openstack-controller/pom.xml b/ncomp-openstack-controller/pom.xml
index 71790a7..1781dde 100644
--- a/ncomp-openstack-controller/pom.xml
+++ b/ncomp-openstack-controller/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.openecomp.ncomp.sirius.manager</groupId>
<artifactId>ncomp-sirius-manager-base</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-base</relativePath>
</parent>
<dependencies>
diff --git a/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/openstack/controller/tools/Generator.java b/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/openstack/controller/tools/Generator.java
index 397b827..b5c366e 100644
--- a/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/openstack/controller/tools/Generator.java
+++ b/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/openstack/controller/tools/Generator.java
@@ -47,12 +47,13 @@ public class Generator {
String dir = p.getNsURI().replace(p.getNsPrefix(),"") + "servers." + p.getNsPrefix();
dir= "src/main/sirius-gen/" + dir.replace('.', '/');
ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();
- m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
+ m.setTemplateDirectory("../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
m.setPrefix("Os");
m.setPluginName(p.getNsURI());
m.setName("OpenStackController");
m.setTitle("OpenStack Controller");
ControllerGenerator g = new ControllerGenerator(o,m);
+ g.setVersion("ONAP-R2");
EObject loc =LocationFactory.eINSTANCE.createOpenStackLocation();
g.addObject("loc",loc,m);
g.setEnableIRequestHandler(false);
@@ -62,7 +63,6 @@ public class Generator {
//g.addApi("e",e,m);
//g.addFactory("org.openecomp.ncomp.sirius.servers.openstack.OsOpenstackFactory");
g.generate(dir);
- g.generateAnt("./ant.xml",true,true);
g.generateScripts("src/main/server-gen/bin","openstack-controller");
String pName = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".logging";
YamlToJava.convert("src/main/resources/OpenStackAdaptor.yaml", dir + "/logging", pName);
diff --git a/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerProvider.java b/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerProvider.java
index 07941a9..26bf870 100644
--- a/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerProvider.java
+++ b/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerProvider.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
import org.apache.log4j.Logger;
import org.json.JSONObject;
-import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
import org.openecomp.ncomp.openstack.OpenStackController;
import org.openecomp.ncomp.openstack.controller.tools.OpenStackUtil;
import org.openecomp.ncomp.openstack.location.OpenStackLocation;
@@ -38,11 +38,12 @@ import org.openecomp.ncomp.sirius.manager.ISiriusServer;
import org.openecomp.ncomp.sirius.manager.ManagementServer;
import org.openecomp.ncomp.sirius.manager.ManagementServerError;
import org.openecomp.ncomp.sirius.manager.ManagementServerUtils;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
import org.openecomp.ncomp.sirius.manager.server.ServerPackage;
public class OsOpenStackControllerProvider extends BasicAdaptorProvider {
public static final Logger logger = Logger.getLogger(OsOpenStackControllerProvider.class);
- static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+ static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
private HashMap<String, OpenStackUtil> utils = new HashMap<String, OpenStackUtil>();
private HashMap<String, Thread> pollers = new HashMap<String, Thread>();
private HashMap<String, Date> lastPoll = new HashMap<String, Date>();
@@ -71,20 +72,20 @@ public class OsOpenStackControllerProvider extends BasicAdaptorProvider {
t = new Thread("openstackPoller " + l.getName()) {
@Override
public void run() {
- ecomplogger.setOperation(OpenStackAdaptorOperationEnum.POLLING);
while (true) {
Date lastPoll2 = lastPoll.get(l.getName());
if (lastPoll2 == null || lastPoll2.getTime() + pollingFrequency < new Date().getTime()) {
try {
+ ecomplogger.setOperation(OpenStackAdaptorOperationEnum.POLLING);
ecomplogger.newRequestId();
+ ecomplogger.setInstanceId(controller, l);
ecomplogger.recordAuditEventStart();
openstackPolling(l);
+ ecomplogger.recordAuditEventEnd();
} catch (Exception e) {
ecomplogger.warn(OpenStackAdaptorMessageEnum.POLLING_FAILED, ManagementServer.object2ref(l));
ManagementServerUtils.printStackTrace(e);
- }
- finally {
- ecomplogger.recordAuditEventEnd();
+ ecomplogger.recordAuditEventEnd(StatusCodeEnum.ERROR);
}
}
try {
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/OpenStackController.yaml b/ncomp-openstack-controller/src/main/sirius-gen/OpenStackController.yaml
index fb697a4..76c322f 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/OpenStackController.yaml
+++ b/ncomp-openstack-controller/src/main/sirius-gen/OpenStackController.yaml
@@ -1,14 +1,12 @@
operations:
- uploadOpenstackConfiguration: {}
- REMOTE_uploadOpenstackConfiguration:
- decription: Remote call uploadOpenstackConfiguration
+ OpenStackController@uploadOpenstackConfiguration: {}
messages:
dummy: {}
- uploadOpenstackConfiguration:
- errorCode: uploadOpenstackConfiguration-FAILED-5001W
+ REQUEST-FAILED-uploadOpenstackConfiguration:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- REMOTE_uploadOpenstackConfiguration:
- errorCode: REMOTE-uploadOpenstackConfiguration-FAILED-5001W
+ REMOTE-CALL-FAILED-uploadOpenstackConfiguration:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/OpenStackLocation.yaml b/ncomp-openstack-controller/src/main/sirius-gen/OpenStackLocation.yaml
index 3296bdc..bc1eb42 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/OpenStackLocation.yaml
+++ b/ncomp-openstack-controller/src/main/sirius-gen/OpenStackLocation.yaml
@@ -1,267 +1,219 @@
operations:
- createNetwork: {}
- createSubnet: {}
- createPort: {}
- createRouter: {}
- deleteNetwork: {}
- deleteSubnet: {}
- deletePort: {}
- deleteRouter: {}
- associateFloatingIp: {}
- createServer: {}
- deleteServer: {}
- createKeyPair: {}
- delete: {}
- createFlavor: {}
- createSecurityGroup: {}
- serverAction: {}
- deployVmType: {}
- undeployVmType: {}
- deployUser: {}
- undeployUser: {}
- createAlarm: {}
- deleteAlarm: {}
- poll: {}
- mergeLocation: {}
- REMOTE_createNetwork:
- decription: Remote call createNetwork
- REMOTE_createSubnet:
- decription: Remote call createSubnet
- REMOTE_createPort:
- decription: Remote call createPort
- REMOTE_createRouter:
- decription: Remote call createRouter
- REMOTE_deleteNetwork:
- decription: Remote call deleteNetwork
- REMOTE_deleteSubnet:
- decription: Remote call deleteSubnet
- REMOTE_deletePort:
- decription: Remote call deletePort
- REMOTE_deleteRouter:
- decription: Remote call deleteRouter
- REMOTE_associateFloatingIp:
- decription: Remote call associateFloatingIp
- REMOTE_createServer:
- decription: Remote call createServer
- REMOTE_deleteServer:
- decription: Remote call deleteServer
- REMOTE_createKeyPair:
- decription: Remote call createKeyPair
- REMOTE_delete:
- decription: Remote call delete
- REMOTE_createFlavor:
- decription: Remote call createFlavor
- REMOTE_createSecurityGroup:
- decription: Remote call createSecurityGroup
- REMOTE_serverAction:
- decription: Remote call serverAction
- REMOTE_deployVmType:
- decription: Remote call deployVmType
- REMOTE_undeployVmType:
- decription: Remote call undeployVmType
- REMOTE_deployUser:
- decription: Remote call deployUser
- REMOTE_undeployUser:
- decription: Remote call undeployUser
- REMOTE_createAlarm:
- decription: Remote call createAlarm
- REMOTE_deleteAlarm:
- decription: Remote call deleteAlarm
- REMOTE_poll:
- decription: Remote call poll
- REMOTE_mergeLocation:
- decription: Remote call mergeLocation
+ OpenStackLocation@createNetwork: {}
+ OpenStackLocation@createSubnet: {}
+ OpenStackLocation@createPort: {}
+ OpenStackLocation@createRouter: {}
+ OpenStackLocation@deleteNetwork: {}
+ OpenStackLocation@deleteSubnet: {}
+ OpenStackLocation@deletePort: {}
+ OpenStackLocation@deleteRouter: {}
+ OpenStackLocation@associateFloatingIp: {}
+ OpenStackLocation@createServer: {}
+ OpenStackLocation@deleteServer: {}
+ OpenStackLocation@createKeyPair: {}
+ OpenStackLocation@delete: {}
+ OpenStackLocation@createFlavor: {}
+ OpenStackLocation@createSecurityGroup: {}
+ OpenStackLocation@serverAction: {}
+ OpenStackLocation@deployVmType: {}
+ OpenStackLocation@undeployVmType: {}
+ OpenStackLocation@deployUser: {}
+ OpenStackLocation@undeployUser: {}
+ OpenStackLocation@createAlarm: {}
+ OpenStackLocation@deleteAlarm: {}
+ OpenStackLocation@poll: {}
+ OpenStackLocation@mergeLocation: {}
messages:
dummy: {}
- createNetwork:
- errorCode: createNetwork-FAILED-5001W
+ REQUEST-FAILED-createNetwork:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createSubnet:
- errorCode: createSubnet-FAILED-5001W
+ REQUEST-FAILED-createSubnet:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createPort:
- errorCode: createPort-FAILED-5001W
+ REQUEST-FAILED-createPort:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createRouter:
- errorCode: createRouter-FAILED-5001W
+ REQUEST-FAILED-createRouter:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deleteNetwork:
- errorCode: deleteNetwork-FAILED-5001W
+ REQUEST-FAILED-deleteNetwork:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deleteSubnet:
- errorCode: deleteSubnet-FAILED-5001W
+ REQUEST-FAILED-deleteSubnet:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deletePort:
- errorCode: deletePort-FAILED-5001W
+ REQUEST-FAILED-deletePort:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deleteRouter:
- errorCode: deleteRouter-FAILED-5001W
+ REQUEST-FAILED-deleteRouter:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- associateFloatingIp:
- errorCode: associateFloatingIp-FAILED-5001W
+ REQUEST-FAILED-associateFloatingIp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createServer:
- errorCode: createServer-FAILED-5001W
+ REQUEST-FAILED-createServer:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deleteServer:
- errorCode: deleteServer-FAILED-5001W
+ REQUEST-FAILED-deleteServer:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createKeyPair:
- errorCode: createKeyPair-FAILED-5001W
+ REQUEST-FAILED-createKeyPair:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- delete:
- errorCode: delete-FAILED-5001W
+ REQUEST-FAILED-delete:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createFlavor:
- errorCode: createFlavor-FAILED-5001W
+ REQUEST-FAILED-createFlavor:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createSecurityGroup:
- errorCode: createSecurityGroup-FAILED-5001W
+ REQUEST-FAILED-createSecurityGroup:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- serverAction:
- errorCode: serverAction-FAILED-5001W
+ REQUEST-FAILED-serverAction:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deployVmType:
- errorCode: deployVmType-FAILED-5001W
+ REQUEST-FAILED-deployVmType:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- undeployVmType:
- errorCode: undeployVmType-FAILED-5001W
+ REQUEST-FAILED-undeployVmType:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deployUser:
- errorCode: deployUser-FAILED-5001W
+ REQUEST-FAILED-deployUser:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- undeployUser:
- errorCode: undeployUser-FAILED-5001W
+ REQUEST-FAILED-undeployUser:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createAlarm:
- errorCode: createAlarm-FAILED-5001W
+ REQUEST-FAILED-createAlarm:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deleteAlarm:
- errorCode: deleteAlarm-FAILED-5001W
+ REQUEST-FAILED-deleteAlarm:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- poll:
- errorCode: poll-FAILED-5001W
+ REQUEST-FAILED-poll:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- mergeLocation:
- errorCode: mergeLocation-FAILED-5001W
+ REQUEST-FAILED-mergeLocation:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- REMOTE_createNetwork:
- errorCode: REMOTE-createNetwork-FAILED-5001W
+ REMOTE-CALL-FAILED-createNetwork:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createSubnet:
- errorCode: REMOTE-createSubnet-FAILED-5001W
+ REMOTE-CALL-FAILED-createSubnet:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createPort:
- errorCode: REMOTE-createPort-FAILED-5001W
+ REMOTE-CALL-FAILED-createPort:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createRouter:
- errorCode: REMOTE-createRouter-FAILED-5001W
+ REMOTE-CALL-FAILED-createRouter:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deleteNetwork:
- errorCode: REMOTE-deleteNetwork-FAILED-5001W
+ REMOTE-CALL-FAILED-deleteNetwork:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deleteSubnet:
- errorCode: REMOTE-deleteSubnet-FAILED-5001W
+ REMOTE-CALL-FAILED-deleteSubnet:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deletePort:
- errorCode: REMOTE-deletePort-FAILED-5001W
+ REMOTE-CALL-FAILED-deletePort:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deleteRouter:
- errorCode: REMOTE-deleteRouter-FAILED-5001W
+ REMOTE-CALL-FAILED-deleteRouter:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_associateFloatingIp:
- errorCode: REMOTE-associateFloatingIp-FAILED-5001W
+ REMOTE-CALL-FAILED-associateFloatingIp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createServer:
- errorCode: REMOTE-createServer-FAILED-5001W
+ REMOTE-CALL-FAILED-createServer:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deleteServer:
- errorCode: REMOTE-deleteServer-FAILED-5001W
+ REMOTE-CALL-FAILED-deleteServer:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createKeyPair:
- errorCode: REMOTE-createKeyPair-FAILED-5001W
+ REMOTE-CALL-FAILED-createKeyPair:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_delete:
- errorCode: REMOTE-delete-FAILED-5001W
+ REMOTE-CALL-FAILED-delete:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createFlavor:
- errorCode: REMOTE-createFlavor-FAILED-5001W
+ REMOTE-CALL-FAILED-createFlavor:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createSecurityGroup:
- errorCode: REMOTE-createSecurityGroup-FAILED-5001W
+ REMOTE-CALL-FAILED-createSecurityGroup:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_serverAction:
- errorCode: REMOTE-serverAction-FAILED-5001W
+ REMOTE-CALL-FAILED-serverAction:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deployVmType:
- errorCode: REMOTE-deployVmType-FAILED-5001W
+ REMOTE-CALL-FAILED-deployVmType:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_undeployVmType:
- errorCode: REMOTE-undeployVmType-FAILED-5001W
+ REMOTE-CALL-FAILED-undeployVmType:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deployUser:
- errorCode: REMOTE-deployUser-FAILED-5001W
+ REMOTE-CALL-FAILED-deployUser:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_undeployUser:
- errorCode: REMOTE-undeployUser-FAILED-5001W
+ REMOTE-CALL-FAILED-undeployUser:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createAlarm:
- errorCode: REMOTE-createAlarm-FAILED-5001W
+ REMOTE-CALL-FAILED-createAlarm:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deleteAlarm:
- errorCode: REMOTE-deleteAlarm-FAILED-5001W
+ REMOTE-CALL-FAILED-deleteAlarm:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_poll:
- errorCode: REMOTE-poll-FAILED-5001W
+ REMOTE-CALL-FAILED-poll:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_mergeLocation:
- errorCode: REMOTE-mergeLocation-FAILED-5001W
+ REMOTE-CALL-FAILED-mergeLocation:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackController.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackController.java
index f6db33f..c78df86 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackController.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackController.java
@@ -26,20 +26,27 @@ package org.openecomp.ncomp.servers.openstack;
+
import java.io.InputStream;
import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
import org.openecomp.ncomp.sirius.function.FunctionUtils;
import org.openecomp.ncomp.component.ApiRequestStatus;
import org.apache.log4j.Logger;
-import org.openecomp.logger.EcompLogger;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
import org.json.JSONObject;
import java.util.Date;
@@ -54,9 +61,9 @@ import org.openecomp.ncomp.openstack.impl.OpenStackControllerImpl;
-public class OsOpenStackController extends OpenStackControllerImpl implements ISiriusPlugin {
+public class OsOpenStackController extends OpenStackControllerImpl implements ISiriusProvider, ISiriusPlugin {
public static final Logger logger = Logger.getLogger(OsOpenStackController.class);
- static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+ static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
public OsOpenStackControllerProvider controller;
ISiriusServer server;
@@ -71,9 +78,8 @@ public class OsOpenStackController extends OpenStackControllerImpl implements IS
if (server != null)
server.getServer().recordApi(null, this, "uploadOpenstackConfiguration", ApiRequestStatus.START, duration_,cx,loc);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackControllerOperationEnum.uploadOpenstackConfiguration);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackControllerOperationEnum.OpenStackController_uploadOpenstackConfiguration,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackControllerOperationEnum.OpenStackController_uploadOpenstackConfiguration,"self:" + ManagementServer.object2ref(this));
try {
controller.uploadOpenstackConfiguration(cx,loc);
}
@@ -82,8 +88,10 @@ public class OsOpenStackController extends OpenStackControllerImpl implements IS
if (server != null)
server.getServer().recordApi(null, this, "uploadOpenstackConfiguration", ApiRequestStatus.ERROR, duration_,cx,loc);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackControllerMessageEnum.uploadOpenstackConfiguration, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackControllerMessageEnum.REQUEST_FAILED_uploadOpenstackConfiguration, e.toString());
+ EcompException e1 = EcompException.create(OpenStackControllerMessageEnum.REQUEST_FAILED_uploadOpenstackConfiguration,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackControllerMessageEnum.REQUEST_FAILED_uploadOpenstackConfiguration, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -97,6 +105,8 @@ public class OsOpenStackController extends OpenStackControllerImpl implements IS
+
+
@Override
public void start() {
controller.start();
@@ -105,7 +115,7 @@ public class OsOpenStackController extends OpenStackControllerImpl implements IS
public static void ecoreSetup() {
OsOpenStackControllerProvider.ecoreSetup();
}
- public OsOpenStackControllerProvider getSomfProvider() {
+ public OsOpenStackControllerProvider getSiriusProvider() {
return controller;
}
}
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerClient.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerClient.java
index 855faf9..45f8bc4 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerClient.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
import org.apache.log4j.Logger;
import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class OsOpenStackControllerClient extends OpenStackControllerImpl {
OsOpenStackController.ecoreSetup();
client = new GenericHttpClient(file,name);
client.add("/resources", this);
+ client.setVersion("ONAP-R2");
}
public OsOpenStackControllerClient(String file, String name1, String name2) {
HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
client = client1.all; // requests should be forwarded to all.
client.add("/resources", this);
+ client.setVersion("ONAP-R2");
}
public OsOpenStackControllerClient(AbstractClient c) {
client = c;
client.add("/resources", this);
+ client.setVersion("ONAP-R2");
}
@Override
public void uploadOpenstackConfiguration(org.json.JSONObject cx, org.openecomp.ncomp.openstack.location.OpenStackLocation loc) {
- EClass c = OpenstackPackage.eINSTANCE.getOpenStackController(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackControllerOperationEnum.REMOTE_uploadOpenstackConfiguration);
+ EClass c = OpenstackPackage.eINSTANCE.getOpenStackController();
+ ecomplogger.recordMetricEventStart(OpenStackControllerOperationEnum.OpenStackController_uploadOpenstackConfiguration,client.getRemote());
try {
client.operationPath("/resources", c, "uploadOpenstackConfiguration", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,loc);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackControllerMessageEnum.REMOTE_uploadOpenstackConfiguration, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@uploadOpenstackConfiguration: " + e);
+ ecomplogger.warn(OpenStackControllerMessageEnum.REMOTE_CALL_FAILED_uploadOpenstackConfiguration, e.toString());
+ EcompException e1 = EcompException.create(OpenStackControllerMessageEnum.REMOTE_CALL_FAILED_uploadOpenstackConfiguration,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackControllerMessageEnum.REMOTE_CALL_FAILED_uploadOpenstackConfiguration,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerServer.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerServer.java
index 4249dc3..a5083ca 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerServer.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerServer.java
@@ -26,17 +26,16 @@ package org.openecomp.ncomp.servers.openstack;
import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Properties;
import java.util.TimeZone;
import org.apache.log4j.Logger;
import org.eclipse.emf.ecore.EFactory;
-
-import org.openecomp.entity.EcompComponent;
-import org.openecomp.entity.EcompSubComponent;
-import org.openecomp.entity.EcompSubComponentInstance;
+import org.json.JSONObject;
import org.openecomp.ncomp.sirius.manager.Jetty8Server;
import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
import org.openecomp.ncomp.sirius.manager.ISiriusServer;
import org.openecomp.ncomp.openstack.OpenStackController;
@@ -48,7 +47,7 @@ import org.openecomp.ncomp.servers.openstack.loc.OsLocationFactory;
-public class OsOpenStackControllerServer implements ISiriusServer {
+public class OsOpenStackControllerServer implements ISiriusServer, IRequestHandler {
public static final Logger logger = Logger.getLogger(OsOpenStackControllerServer.class);
String serverPath;
ManagementServer server;
@@ -69,6 +68,7 @@ public class OsOpenStackControllerServer implements ISiriusServer {
props = getPropertiesFromClasspath(filename);
serverPath = (String) props.get("server.dir");
server = new ManagementServer(f, "OpenStackController", serverPath, filename);
+ ManagementServer.setBuildVersion("ONAP-R2");
server.addFactory(f);
server.addRuntimeFactories(this);
@@ -78,6 +78,7 @@ public class OsOpenStackControllerServer implements ISiriusServer {
controller = (OsOpenStackController) server.find("/").o;
webServer = new Jetty8Server("openstack.properties");
webServer.add("/resources",server);
+ webServer.add("/api",this);
@@ -106,4 +107,17 @@ public class OsOpenStackControllerServer implements ISiriusServer {
public ManagementServer getServer() {
return server;
}
+ public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+ String clientVersion) {
+ switch ((String) context.get("path")) {
+ case "/api/versions":
+ return server.supportedVersions();
+ }
+ logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+ throw new RuntimeException("Unknown request");
+ }
+ public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+ return null;
+ }
+
}
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/OsOpenStackLocation.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/OsOpenStackLocation.java
index 120135c..d7eab0f 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/OsOpenStackLocation.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/OsOpenStackLocation.java
@@ -26,20 +26,27 @@ package org.openecomp.ncomp.servers.openstack.loc;
+
import java.io.InputStream;
import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
import org.openecomp.ncomp.sirius.function.FunctionUtils;
import org.openecomp.ncomp.component.ApiRequestStatus;
import org.apache.log4j.Logger;
-import org.openecomp.logger.EcompLogger;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
import org.json.JSONObject;
import java.util.Date;
@@ -54,9 +61,9 @@ import org.openecomp.ncomp.openstack.location.impl.OpenStackLocationImpl;
-public class OsOpenStackLocation extends OpenStackLocationImpl {
+public class OsOpenStackLocation extends OpenStackLocationImpl implements ISiriusProvider {
public static final Logger logger = Logger.getLogger(OsOpenStackLocation.class);
- static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+ static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
public OsOpenStackLocationProvider controller;
ISiriusServer server;
@@ -71,9 +78,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "poll", ApiRequestStatus.START, duration_);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.poll);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_poll,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_poll,"self:" + ManagementServer.object2ref(this));
try {
controller.poll();
}
@@ -82,8 +88,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "poll", ApiRequestStatus.ERROR, duration_);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.poll, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_poll, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_poll,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_poll, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -98,9 +106,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "mergeLocation", ApiRequestStatus.START, duration_,loc);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.mergeLocation);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_mergeLocation,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_mergeLocation,"self:" + ManagementServer.object2ref(this));
try {
controller.mergeLocation(loc);
}
@@ -109,8 +116,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "mergeLocation", ApiRequestStatus.ERROR, duration_,loc);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.mergeLocation, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_mergeLocation, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_mergeLocation,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_mergeLocation, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -125,9 +134,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createNetwork", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.createNetwork);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_createNetwork,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createNetwork,"self:" + ManagementServer.object2ref(this));
try {
res = controller.createNetwork(request);
}
@@ -136,8 +144,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createNetwork", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.createNetwork, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_createNetwork, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_createNetwork,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_createNetwork, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -152,9 +162,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createSubnet", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.createSubnet);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_createSubnet,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createSubnet,"self:" + ManagementServer.object2ref(this));
try {
res = controller.createSubnet(request);
}
@@ -163,8 +172,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createSubnet", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.createSubnet, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_createSubnet, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_createSubnet,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_createSubnet, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -179,9 +190,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createPort", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.createPort);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_createPort,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createPort,"self:" + ManagementServer.object2ref(this));
try {
res = controller.createPort(request);
}
@@ -190,8 +200,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createPort", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.createPort, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_createPort, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_createPort,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_createPort, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -206,9 +218,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createRouter", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.createRouter);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_createRouter,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createRouter,"self:" + ManagementServer.object2ref(this));
try {
res = controller.createRouter(request);
}
@@ -217,8 +228,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createRouter", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.createRouter, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_createRouter, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_createRouter,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_createRouter, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -233,9 +246,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deleteNetwork", ApiRequestStatus.START, duration_,projectName,name);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.deleteNetwork);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_deleteNetwork,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deleteNetwork,"self:" + ManagementServer.object2ref(this));
try {
controller.deleteNetwork(projectName,name);
}
@@ -244,8 +256,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deleteNetwork", ApiRequestStatus.ERROR, duration_,projectName,name);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.deleteNetwork, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_deleteNetwork, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_deleteNetwork,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_deleteNetwork, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -260,9 +274,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deleteSubnet", ApiRequestStatus.START, duration_,projectName,name);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.deleteSubnet);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_deleteSubnet,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deleteSubnet,"self:" + ManagementServer.object2ref(this));
try {
controller.deleteSubnet(projectName,name);
}
@@ -271,8 +284,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deleteSubnet", ApiRequestStatus.ERROR, duration_,projectName,name);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.deleteSubnet, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_deleteSubnet, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_deleteSubnet,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_deleteSubnet, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -287,9 +302,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deletePort", ApiRequestStatus.START, duration_,projectName,name);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.deletePort);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_deletePort,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deletePort,"self:" + ManagementServer.object2ref(this));
try {
controller.deletePort(projectName,name);
}
@@ -298,8 +312,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deletePort", ApiRequestStatus.ERROR, duration_,projectName,name);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.deletePort, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_deletePort, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_deletePort,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_deletePort, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -314,9 +330,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deleteRouter", ApiRequestStatus.START, duration_,projectName,name);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.deleteRouter);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_deleteRouter,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deleteRouter,"self:" + ManagementServer.object2ref(this));
try {
controller.deleteRouter(projectName,name);
}
@@ -325,8 +340,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deleteRouter", ApiRequestStatus.ERROR, duration_,projectName,name);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.deleteRouter, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_deleteRouter, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_deleteRouter,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_deleteRouter, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -341,9 +358,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "associateFloatingIp", ApiRequestStatus.START, duration_,projectName,ipId,portId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.associateFloatingIp);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_associateFloatingIp,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_associateFloatingIp,"self:" + ManagementServer.object2ref(this));
try {
controller.associateFloatingIp(projectName,ipId,portId);
}
@@ -352,8 +368,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "associateFloatingIp", ApiRequestStatus.ERROR, duration_,projectName,ipId,portId);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.associateFloatingIp, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_associateFloatingIp, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_associateFloatingIp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_associateFloatingIp, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -368,9 +386,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createServer", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.createServer);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_createServer,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createServer,"self:" + ManagementServer.object2ref(this));
try {
controller.createServer(request);
}
@@ -379,8 +396,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createServer", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.createServer, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_createServer, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_createServer,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_createServer, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -395,9 +414,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deleteServer", ApiRequestStatus.START, duration_,projectName,name);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.deleteServer);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_deleteServer,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deleteServer,"self:" + ManagementServer.object2ref(this));
try {
controller.deleteServer(projectName,name);
}
@@ -406,8 +424,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deleteServer", ApiRequestStatus.ERROR, duration_,projectName,name);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.deleteServer, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_deleteServer, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_deleteServer,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_deleteServer, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -422,9 +442,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createKeyPair", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.createKeyPair);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_createKeyPair,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createKeyPair,"self:" + ManagementServer.object2ref(this));
try {
controller.createKeyPair(request);
}
@@ -433,8 +452,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createKeyPair", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.createKeyPair, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_createKeyPair, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_createKeyPair,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_createKeyPair, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -449,9 +470,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "delete", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.delete);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_delete,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_delete,"self:" + ManagementServer.object2ref(this));
try {
controller.delete(request);
}
@@ -460,8 +480,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "delete", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.delete, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_delete, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_delete,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_delete, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -476,9 +498,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createFlavor", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.createFlavor);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_createFlavor,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createFlavor,"self:" + ManagementServer.object2ref(this));
try {
controller.createFlavor(request);
}
@@ -487,8 +508,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createFlavor", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.createFlavor, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_createFlavor, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_createFlavor,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_createFlavor, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -503,9 +526,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createSecurityGroup", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.createSecurityGroup);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_createSecurityGroup,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createSecurityGroup,"self:" + ManagementServer.object2ref(this));
try {
controller.createSecurityGroup(request);
}
@@ -514,8 +536,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createSecurityGroup", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.createSecurityGroup, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_createSecurityGroup, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_createSecurityGroup,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_createSecurityGroup, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -530,9 +554,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "serverAction", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.serverAction);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_serverAction,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_serverAction,"self:" + ManagementServer.object2ref(this));
try {
controller.serverAction(request);
}
@@ -541,8 +564,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "serverAction", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.serverAction, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_serverAction, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_serverAction,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_serverAction, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -557,9 +582,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deployVmType", ApiRequestStatus.START, duration_,vmTypeName,projectName);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.deployVmType);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_deployVmType,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deployVmType,"self:" + ManagementServer.object2ref(this));
try {
controller.deployVmType(vmTypeName,projectName);
}
@@ -568,8 +592,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deployVmType", ApiRequestStatus.ERROR, duration_,vmTypeName,projectName);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.deployVmType, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_deployVmType, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_deployVmType,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_deployVmType, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -584,9 +610,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "undeployVmType", ApiRequestStatus.START, duration_,vmTypeName,projectName);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.undeployVmType);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_undeployVmType,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_undeployVmType,"self:" + ManagementServer.object2ref(this));
try {
controller.undeployVmType(vmTypeName,projectName);
}
@@ -595,8 +620,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "undeployVmType", ApiRequestStatus.ERROR, duration_,vmTypeName,projectName);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.undeployVmType, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_undeployVmType, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_undeployVmType,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_undeployVmType, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -611,9 +638,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deployUser", ApiRequestStatus.START, duration_,user,projectName);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.deployUser);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_deployUser,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deployUser,"self:" + ManagementServer.object2ref(this));
try {
controller.deployUser(user,projectName);
}
@@ -622,8 +648,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deployUser", ApiRequestStatus.ERROR, duration_,user,projectName);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.deployUser, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_deployUser, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_deployUser,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_deployUser, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -638,9 +666,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "undeployUser", ApiRequestStatus.START, duration_,user,projectName);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.undeployUser);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_undeployUser,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_undeployUser,"self:" + ManagementServer.object2ref(this));
try {
controller.undeployUser(user,projectName);
}
@@ -649,8 +676,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "undeployUser", ApiRequestStatus.ERROR, duration_,user,projectName);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.undeployUser, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_undeployUser, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_undeployUser,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_undeployUser, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -665,9 +694,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createAlarm", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.createAlarm);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_createAlarm,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createAlarm,"self:" + ManagementServer.object2ref(this));
try {
res = controller.createAlarm(request);
}
@@ -676,8 +704,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createAlarm", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.createAlarm, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_createAlarm, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_createAlarm,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_createAlarm, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -692,9 +722,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deleteAlarm", ApiRequestStatus.START, duration_,projectName,name);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.deleteAlarm);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_deleteAlarm,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deleteAlarm,"self:" + ManagementServer.object2ref(this));
try {
controller.deleteAlarm(projectName,name);
}
@@ -703,8 +732,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "deleteAlarm", ApiRequestStatus.ERROR, duration_,projectName,name);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.deleteAlarm, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_deleteAlarm, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_deleteAlarm,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_deleteAlarm, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -719,9 +750,8 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createAlarm", ApiRequestStatus.START, duration_,request);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.createAlarm);
- ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+ ecomplogger.recordAuditEventStartIfNeeded(OpenStackLocationOperationEnum.OpenStackLocation_createAlarm,server,this);
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createAlarm,"self:" + ManagementServer.object2ref(this));
try {
res = controller.createAlarm(request);
}
@@ -730,8 +760,10 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
if (server != null)
server.getServer().recordApi(null, this, "createAlarm", ApiRequestStatus.ERROR, duration_,request);
System.err.println("ERROR: " + e);
- ecomplogger.warn(OpenStackLocationMessageEnum.createAlarm, e.toString());
- throw e;
+ ecomplogger.warn(OpenStackLocationMessageEnum.REQUEST_FAILED_createAlarm, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REQUEST_FAILED_createAlarm,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, OpenStackLocationMessageEnum.REQUEST_FAILED_createAlarm, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -745,10 +777,12 @@ public class OsOpenStackLocation extends OpenStackLocationImpl {
+
+
public static void ecoreSetup() {
OsOpenStackLocationProvider.ecoreSetup();
}
- public OsOpenStackLocationProvider getSomfProvider() {
+ public OsOpenStackLocationProvider getSiriusProvider() {
return controller;
}
}
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/OsOpenStackLocationClient.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/OsOpenStackLocationClient.java
index 92bfacc..24e8bee 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/OsOpenStackLocationClient.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/OsOpenStackLocationClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
import org.apache.log4j.Logger;
import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
OsOpenStackController.ecoreSetup();
client = new GenericHttpClient(file,name);
client.add("/loc", this);
+ client.setVersion("ONAP-R2");
}
public OsOpenStackLocationClient(String file, String name1, String name2) {
HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
client = client1.all; // requests should be forwarded to all.
client.add("/loc", this);
+ client.setVersion("ONAP-R2");
}
public OsOpenStackLocationClient(AbstractClient c) {
client = c;
client.add("/resources", this);
+ client.setVersion("ONAP-R2");
}
@Override
public void poll() {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_poll);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_poll,client.getRemote());
try {
client.operationPath("/loc", c, "poll", null);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_poll, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@poll: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_poll, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_poll,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_poll,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -89,16 +95,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void mergeLocation(org.openecomp.ncomp.openstack.location.OpenStackLocation loc) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_mergeLocation);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_mergeLocation,client.getRemote());
try {
client.operationPath("/loc", c, "mergeLocation", null, loc);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_mergeLocation, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@mergeLocation: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_mergeLocation, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_mergeLocation,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_mergeLocation,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -106,16 +113,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public org.openecomp.ncomp.openstack.neutron.Network createNetwork(org.openecomp.ncomp.openstack.neutron.CreateNetworkRequest request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_createNetwork);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createNetwork,client.getRemote());
org.openecomp.ncomp.openstack.neutron.Network res;
try {
res = (org.openecomp.ncomp.openstack.neutron.Network) client.operationPath("/loc", c, "createNetwork", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_createNetwork, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@createNetwork: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createNetwork, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createNetwork,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createNetwork,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -123,16 +131,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public org.openecomp.ncomp.openstack.neutron.Subnet createSubnet(org.openecomp.ncomp.openstack.neutron.CreateSubnetRequest request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_createSubnet);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createSubnet,client.getRemote());
org.openecomp.ncomp.openstack.neutron.Subnet res;
try {
res = (org.openecomp.ncomp.openstack.neutron.Subnet) client.operationPath("/loc", c, "createSubnet", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_createSubnet, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@createSubnet: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createSubnet, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createSubnet,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createSubnet,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -140,16 +149,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public org.openecomp.ncomp.openstack.neutron.Port createPort(org.openecomp.ncomp.openstack.neutron.CreatePortRequest request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_createPort);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createPort,client.getRemote());
org.openecomp.ncomp.openstack.neutron.Port res;
try {
res = (org.openecomp.ncomp.openstack.neutron.Port) client.operationPath("/loc", c, "createPort", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_createPort, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@createPort: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createPort, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createPort,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createPort,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -157,16 +167,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public org.openecomp.ncomp.openstack.neutron.Router createRouter(org.openecomp.ncomp.openstack.neutron.CreateRouterRequest request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_createRouter);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createRouter,client.getRemote());
org.openecomp.ncomp.openstack.neutron.Router res;
try {
res = (org.openecomp.ncomp.openstack.neutron.Router) client.operationPath("/loc", c, "createRouter", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_createRouter, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@createRouter: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createRouter, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createRouter,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createRouter,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -174,16 +185,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void deleteNetwork(java.lang.String projectName, java.lang.String name) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_deleteNetwork);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deleteNetwork,client.getRemote());
try {
client.operationPath("/loc", c, "deleteNetwork", null, projectName,name);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_deleteNetwork, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@deleteNetwork: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteNetwork, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteNetwork,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteNetwork,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -191,16 +203,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void deleteSubnet(java.lang.String projectName, java.lang.String name) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_deleteSubnet);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deleteSubnet,client.getRemote());
try {
client.operationPath("/loc", c, "deleteSubnet", null, projectName,name);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_deleteSubnet, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@deleteSubnet: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteSubnet, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteSubnet,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteSubnet,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -208,16 +221,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void deletePort(java.lang.String projectName, java.lang.String name) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_deletePort);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deletePort,client.getRemote());
try {
client.operationPath("/loc", c, "deletePort", null, projectName,name);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_deletePort, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@deletePort: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deletePort, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deletePort,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deletePort,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -225,16 +239,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void deleteRouter(java.lang.String projectName, java.lang.String name) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_deleteRouter);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deleteRouter,client.getRemote());
try {
client.operationPath("/loc", c, "deleteRouter", null, projectName,name);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_deleteRouter, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@deleteRouter: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteRouter, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteRouter,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteRouter,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -242,16 +257,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void associateFloatingIp(java.lang.String projectName, java.lang.String ipId, java.lang.String portId) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_associateFloatingIp);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_associateFloatingIp,client.getRemote());
try {
client.operationPath("/loc", c, "associateFloatingIp", null, projectName,ipId,portId);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_associateFloatingIp, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@associateFloatingIp: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_associateFloatingIp, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_associateFloatingIp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_associateFloatingIp,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -259,16 +275,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void createServer(org.openecomp.ncomp.openstack.compute.OpenstackRequestNewServer request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_createServer);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createServer,client.getRemote());
try {
client.operationPath("/loc", c, "createServer", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_createServer, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@createServer: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createServer, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createServer,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createServer,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -276,16 +293,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void deleteServer(java.lang.String projectName, java.lang.String name) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_deleteServer);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deleteServer,client.getRemote());
try {
client.operationPath("/loc", c, "deleteServer", null, projectName,name);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_deleteServer, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@deleteServer: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteServer, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteServer,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteServer,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -293,16 +311,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void createKeyPair(org.openecomp.ncomp.openstack.compute.OpenstackRequestKeyPair request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_createKeyPair);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createKeyPair,client.getRemote());
try {
client.operationPath("/loc", c, "createKeyPair", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_createKeyPair, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@createKeyPair: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createKeyPair, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createKeyPair,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createKeyPair,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -310,16 +329,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void delete(org.openecomp.ncomp.openstack.core.OpenstackRequestDelete request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_delete);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_delete,client.getRemote());
try {
client.operationPath("/loc", c, "delete", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_delete, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@delete: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_delete, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_delete,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_delete,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -327,16 +347,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void createFlavor(org.openecomp.ncomp.openstack.compute.OpenstackRequestFlavor request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_createFlavor);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createFlavor,client.getRemote());
try {
client.operationPath("/loc", c, "createFlavor", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_createFlavor, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@createFlavor: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createFlavor, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createFlavor,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createFlavor,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -344,16 +365,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void createSecurityGroup(org.openecomp.ncomp.openstack.compute.OpenstackRequestSecurityGroup request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_createSecurityGroup);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createSecurityGroup,client.getRemote());
try {
client.operationPath("/loc", c, "createSecurityGroup", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_createSecurityGroup, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@createSecurityGroup: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createSecurityGroup, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createSecurityGroup,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createSecurityGroup,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -361,16 +383,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void serverAction(org.openecomp.ncomp.openstack.compute.OpenstackRequestServerAction request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_serverAction);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_serverAction,client.getRemote());
try {
client.operationPath("/loc", c, "serverAction", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_serverAction, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@serverAction: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_serverAction, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_serverAction,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_serverAction,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -378,16 +401,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void deployVmType(java.lang.String vmTypeName, java.lang.String projectName) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_deployVmType);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deployVmType,client.getRemote());
try {
client.operationPath("/loc", c, "deployVmType", null, vmTypeName,projectName);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_deployVmType, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@deployVmType: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deployVmType, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deployVmType,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deployVmType,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -395,16 +419,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void undeployVmType(java.lang.String vmTypeName, java.lang.String projectName) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_undeployVmType);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_undeployVmType,client.getRemote());
try {
client.operationPath("/loc", c, "undeployVmType", null, vmTypeName,projectName);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_undeployVmType, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@undeployVmType: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_undeployVmType, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_undeployVmType,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_undeployVmType,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -412,16 +437,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void deployUser(org.openecomp.ncomp.core.User user, java.lang.String projectName) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_deployUser);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deployUser,client.getRemote());
try {
client.operationPath("/loc", c, "deployUser", null, user,projectName);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_deployUser, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@deployUser: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deployUser, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deployUser,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deployUser,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -429,16 +455,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void undeployUser(org.openecomp.ncomp.core.User user, java.lang.String projectName) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_undeployUser);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_undeployUser,client.getRemote());
try {
client.operationPath("/loc", c, "undeployUser", null, user,projectName);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_undeployUser, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@undeployUser: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_undeployUser, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_undeployUser,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_undeployUser,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -446,16 +473,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public org.openecomp.ncomp.openstack.ceilometer.CeilometerAlarm createAlarm(org.openecomp.ncomp.openstack.ceilometer.CreateAlarmRequest request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_createAlarm);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createAlarm,client.getRemote());
org.openecomp.ncomp.openstack.ceilometer.CeilometerAlarm res;
try {
res = (org.openecomp.ncomp.openstack.ceilometer.CeilometerAlarm) client.operationPath("/loc", c, "createAlarm", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_createAlarm, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@createAlarm: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createAlarm, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createAlarm,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createAlarm,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -463,16 +491,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public void deleteAlarm(java.lang.String projectName, java.lang.String name) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_deleteAlarm);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_deleteAlarm,client.getRemote());
try {
client.operationPath("/loc", c, "deleteAlarm", null, projectName,name);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_deleteAlarm, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@deleteAlarm: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteAlarm, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteAlarm,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_deleteAlarm,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -480,16 +509,17 @@ public class OsOpenStackLocationClient extends OpenStackLocationImpl {
@Override
public EList<org.openecomp.ncomp.openstack.ceilometer.CeilometerSample> createAlarm(org.openecomp.ncomp.openstack.ceilometer.SampleRequest request) {
- EClass c = LocationPackage.eINSTANCE.getOpenStackLocation(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(OpenStackLocationOperationEnum.REMOTE_createAlarm);
+ EClass c = LocationPackage.eINSTANCE.getOpenStackLocation();
+ ecomplogger.recordMetricEventStart(OpenStackLocationOperationEnum.OpenStackLocation_createAlarm,client.getRemote());
EList<org.openecomp.ncomp.openstack.ceilometer.CeilometerSample> res;
try {
res = (EList<org.openecomp.ncomp.openstack.ceilometer.CeilometerSample>) client.operationPath("/loc", c, "createAlarm", null, request);
}
catch (Exception e) {
- ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_createAlarm, e.toString());
- throw new RuntimeException("remote call failed: " + client.getRemote() + "@createAlarm: " + e);
+ ecomplogger.warn(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createAlarm, e.toString());
+ EcompException e1 = EcompException.create(OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createAlarm,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,OpenStackLocationMessageEnum.REMOTE_CALL_FAILED_createAlarm,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocation.properties b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocation.properties
index 1329d77..a14de40 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocation.properties
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocation.properties
@@ -1,294 +1,294 @@
dummy=\
- null|\
+ dummy-null|\
null|\
null|\
null
-createNetwork=\
- createNetwork-FAILED-5001W|\
+REQUEST_FAILED_createNetwork=\
+ REQUEST-FAILED-createNetwork-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createSubnet=\
- createSubnet-FAILED-5001W|\
+REQUEST_FAILED_createSubnet=\
+ REQUEST-FAILED-createSubnet-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createPort=\
- createPort-FAILED-5001W|\
+REQUEST_FAILED_createPort=\
+ REQUEST-FAILED-createPort-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createRouter=\
- createRouter-FAILED-5001W|\
+REQUEST_FAILED_createRouter=\
+ REQUEST-FAILED-createRouter-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deleteNetwork=\
- deleteNetwork-FAILED-5001W|\
+REQUEST_FAILED_deleteNetwork=\
+ REQUEST-FAILED-deleteNetwork-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deleteSubnet=\
- deleteSubnet-FAILED-5001W|\
+REQUEST_FAILED_deleteSubnet=\
+ REQUEST-FAILED-deleteSubnet-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deletePort=\
- deletePort-FAILED-5001W|\
+REQUEST_FAILED_deletePort=\
+ REQUEST-FAILED-deletePort-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deleteRouter=\
- deleteRouter-FAILED-5001W|\
+REQUEST_FAILED_deleteRouter=\
+ REQUEST-FAILED-deleteRouter-4001W|\
{0}|\
null|\
Operation Failed with Exception
-associateFloatingIp=\
- associateFloatingIp-FAILED-5001W|\
+REQUEST_FAILED_associateFloatingIp=\
+ REQUEST-FAILED-associateFloatingIp-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createServer=\
- createServer-FAILED-5001W|\
+REQUEST_FAILED_createServer=\
+ REQUEST-FAILED-createServer-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deleteServer=\
- deleteServer-FAILED-5001W|\
+REQUEST_FAILED_deleteServer=\
+ REQUEST-FAILED-deleteServer-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createKeyPair=\
- createKeyPair-FAILED-5001W|\
+REQUEST_FAILED_createKeyPair=\
+ REQUEST-FAILED-createKeyPair-4001W|\
{0}|\
null|\
Operation Failed with Exception
-delete=\
- delete-FAILED-5001W|\
+REQUEST_FAILED_delete=\
+ REQUEST-FAILED-delete-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createFlavor=\
- createFlavor-FAILED-5001W|\
+REQUEST_FAILED_createFlavor=\
+ REQUEST-FAILED-createFlavor-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createSecurityGroup=\
- createSecurityGroup-FAILED-5001W|\
+REQUEST_FAILED_createSecurityGroup=\
+ REQUEST-FAILED-createSecurityGroup-4001W|\
{0}|\
null|\
Operation Failed with Exception
-serverAction=\
- serverAction-FAILED-5001W|\
+REQUEST_FAILED_serverAction=\
+ REQUEST-FAILED-serverAction-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deployVmType=\
- deployVmType-FAILED-5001W|\
+REQUEST_FAILED_deployVmType=\
+ REQUEST-FAILED-deployVmType-4001W|\
{0}|\
null|\
Operation Failed with Exception
-undeployVmType=\
- undeployVmType-FAILED-5001W|\
+REQUEST_FAILED_undeployVmType=\
+ REQUEST-FAILED-undeployVmType-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deployUser=\
- deployUser-FAILED-5001W|\
+REQUEST_FAILED_deployUser=\
+ REQUEST-FAILED-deployUser-4001W|\
{0}|\
null|\
Operation Failed with Exception
-undeployUser=\
- undeployUser-FAILED-5001W|\
+REQUEST_FAILED_undeployUser=\
+ REQUEST-FAILED-undeployUser-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createAlarm=\
- createAlarm-FAILED-5001W|\
+REQUEST_FAILED_createAlarm=\
+ REQUEST-FAILED-createAlarm-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deleteAlarm=\
- deleteAlarm-FAILED-5001W|\
+REQUEST_FAILED_deleteAlarm=\
+ REQUEST-FAILED-deleteAlarm-4001W|\
{0}|\
null|\
Operation Failed with Exception
-poll=\
- poll-FAILED-5001W|\
+REQUEST_FAILED_poll=\
+ REQUEST-FAILED-poll-4001W|\
{0}|\
null|\
Operation Failed with Exception
-mergeLocation=\
- mergeLocation-FAILED-5001W|\
+REQUEST_FAILED_mergeLocation=\
+ REQUEST-FAILED-mergeLocation-4001W|\
{0}|\
null|\
Operation Failed with Exception
-REMOTE_createNetwork=\
- REMOTE-createNetwork-FAILED-5001W|\
+REMOTE_CALL_FAILED_createNetwork=\
+ REMOTE-CALL-FAILED-createNetwork-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createSubnet=\
- REMOTE-createSubnet-FAILED-5001W|\
+REMOTE_CALL_FAILED_createSubnet=\
+ REMOTE-CALL-FAILED-createSubnet-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createPort=\
- REMOTE-createPort-FAILED-5001W|\
+REMOTE_CALL_FAILED_createPort=\
+ REMOTE-CALL-FAILED-createPort-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createRouter=\
- REMOTE-createRouter-FAILED-5001W|\
+REMOTE_CALL_FAILED_createRouter=\
+ REMOTE-CALL-FAILED-createRouter-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deleteNetwork=\
- REMOTE-deleteNetwork-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteNetwork=\
+ REMOTE-CALL-FAILED-deleteNetwork-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deleteSubnet=\
- REMOTE-deleteSubnet-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteSubnet=\
+ REMOTE-CALL-FAILED-deleteSubnet-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deletePort=\
- REMOTE-deletePort-FAILED-5001W|\
+REMOTE_CALL_FAILED_deletePort=\
+ REMOTE-CALL-FAILED-deletePort-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deleteRouter=\
- REMOTE-deleteRouter-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteRouter=\
+ REMOTE-CALL-FAILED-deleteRouter-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_associateFloatingIp=\
- REMOTE-associateFloatingIp-FAILED-5001W|\
+REMOTE_CALL_FAILED_associateFloatingIp=\
+ REMOTE-CALL-FAILED-associateFloatingIp-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createServer=\
- REMOTE-createServer-FAILED-5001W|\
+REMOTE_CALL_FAILED_createServer=\
+ REMOTE-CALL-FAILED-createServer-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deleteServer=\
- REMOTE-deleteServer-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteServer=\
+ REMOTE-CALL-FAILED-deleteServer-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createKeyPair=\
- REMOTE-createKeyPair-FAILED-5001W|\
+REMOTE_CALL_FAILED_createKeyPair=\
+ REMOTE-CALL-FAILED-createKeyPair-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_delete=\
- REMOTE-delete-FAILED-5001W|\
+REMOTE_CALL_FAILED_delete=\
+ REMOTE-CALL-FAILED-delete-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createFlavor=\
- REMOTE-createFlavor-FAILED-5001W|\
+REMOTE_CALL_FAILED_createFlavor=\
+ REMOTE-CALL-FAILED-createFlavor-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createSecurityGroup=\
- REMOTE-createSecurityGroup-FAILED-5001W|\
+REMOTE_CALL_FAILED_createSecurityGroup=\
+ REMOTE-CALL-FAILED-createSecurityGroup-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_serverAction=\
- REMOTE-serverAction-FAILED-5001W|\
+REMOTE_CALL_FAILED_serverAction=\
+ REMOTE-CALL-FAILED-serverAction-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deployVmType=\
- REMOTE-deployVmType-FAILED-5001W|\
+REMOTE_CALL_FAILED_deployVmType=\
+ REMOTE-CALL-FAILED-deployVmType-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_undeployVmType=\
- REMOTE-undeployVmType-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeployVmType=\
+ REMOTE-CALL-FAILED-undeployVmType-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deployUser=\
- REMOTE-deployUser-FAILED-5001W|\
+REMOTE_CALL_FAILED_deployUser=\
+ REMOTE-CALL-FAILED-deployUser-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_undeployUser=\
- REMOTE-undeployUser-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeployUser=\
+ REMOTE-CALL-FAILED-undeployUser-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createAlarm=\
- REMOTE-createAlarm-FAILED-5001W|\
+REMOTE_CALL_FAILED_createAlarm=\
+ REMOTE-CALL-FAILED-createAlarm-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deleteAlarm=\
- REMOTE-deleteAlarm-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteAlarm=\
+ REMOTE-CALL-FAILED-deleteAlarm-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_poll=\
- REMOTE-poll-FAILED-5001W|\
+REMOTE_CALL_FAILED_poll=\
+ REMOTE-CALL-FAILED-poll-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_mergeLocation=\
- REMOTE-mergeLocation-FAILED-5001W|\
+REMOTE_CALL_FAILED_mergeLocation=\
+ REMOTE-CALL-FAILED-mergeLocation-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocationMessageEnum.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocationMessageEnum.java
index b0f7851..8c7031f 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocationMessageEnum.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocationMessageEnum.java
@@ -1,25 +1,4 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.openstack.loc.logging;
import com.att.eelf.i18n.EELFResourceManager;
@@ -28,56 +7,56 @@ import org.openecomp.logger.EcompMessageEnum;
public enum OpenStackLocationMessageEnum implements EcompMessageEnum {
dummy,
- createNetwork,
- createSubnet,
- createPort,
- createRouter,
- deleteNetwork,
- deleteSubnet,
- deletePort,
- deleteRouter,
- associateFloatingIp,
- createServer,
- deleteServer,
- createKeyPair,
- delete,
- createFlavor,
- createSecurityGroup,
- serverAction,
- deployVmType,
- undeployVmType,
- deployUser,
- undeployUser,
- createAlarm,
- deleteAlarm,
- poll,
- mergeLocation,
- REMOTE_createNetwork,
- REMOTE_createSubnet,
- REMOTE_createPort,
- REMOTE_createRouter,
- REMOTE_deleteNetwork,
- REMOTE_deleteSubnet,
- REMOTE_deletePort,
- REMOTE_deleteRouter,
- REMOTE_associateFloatingIp,
- REMOTE_createServer,
- REMOTE_deleteServer,
- REMOTE_createKeyPair,
- REMOTE_delete,
- REMOTE_createFlavor,
- REMOTE_createSecurityGroup,
- REMOTE_serverAction,
- REMOTE_deployVmType,
- REMOTE_undeployVmType,
- REMOTE_deployUser,
- REMOTE_undeployUser,
- REMOTE_createAlarm,
- REMOTE_deleteAlarm,
- REMOTE_poll,
- REMOTE_mergeLocation;
+ REQUEST_FAILED_createNetwork,
+ REQUEST_FAILED_createSubnet,
+ REQUEST_FAILED_createPort,
+ REQUEST_FAILED_createRouter,
+ REQUEST_FAILED_deleteNetwork,
+ REQUEST_FAILED_deleteSubnet,
+ REQUEST_FAILED_deletePort,
+ REQUEST_FAILED_deleteRouter,
+ REQUEST_FAILED_associateFloatingIp,
+ REQUEST_FAILED_createServer,
+ REQUEST_FAILED_deleteServer,
+ REQUEST_FAILED_createKeyPair,
+ REQUEST_FAILED_delete,
+ REQUEST_FAILED_createFlavor,
+ REQUEST_FAILED_createSecurityGroup,
+ REQUEST_FAILED_serverAction,
+ REQUEST_FAILED_deployVmType,
+ REQUEST_FAILED_undeployVmType,
+ REQUEST_FAILED_deployUser,
+ REQUEST_FAILED_undeployUser,
+ REQUEST_FAILED_createAlarm,
+ REQUEST_FAILED_deleteAlarm,
+ REQUEST_FAILED_poll,
+ REQUEST_FAILED_mergeLocation,
+ REMOTE_CALL_FAILED_createNetwork,
+ REMOTE_CALL_FAILED_createSubnet,
+ REMOTE_CALL_FAILED_createPort,
+ REMOTE_CALL_FAILED_createRouter,
+ REMOTE_CALL_FAILED_deleteNetwork,
+ REMOTE_CALL_FAILED_deleteSubnet,
+ REMOTE_CALL_FAILED_deletePort,
+ REMOTE_CALL_FAILED_deleteRouter,
+ REMOTE_CALL_FAILED_associateFloatingIp,
+ REMOTE_CALL_FAILED_createServer,
+ REMOTE_CALL_FAILED_deleteServer,
+ REMOTE_CALL_FAILED_createKeyPair,
+ REMOTE_CALL_FAILED_delete,
+ REMOTE_CALL_FAILED_createFlavor,
+ REMOTE_CALL_FAILED_createSecurityGroup,
+ REMOTE_CALL_FAILED_serverAction,
+ REMOTE_CALL_FAILED_deployVmType,
+ REMOTE_CALL_FAILED_undeployVmType,
+ REMOTE_CALL_FAILED_deployUser,
+ REMOTE_CALL_FAILED_undeployUser,
+ REMOTE_CALL_FAILED_createAlarm,
+ REMOTE_CALL_FAILED_deleteAlarm,
+ REMOTE_CALL_FAILED_poll,
+ REMOTE_CALL_FAILED_mergeLocation;
static {
- EELFResourceManager.loadMessageBundle("org.openecomp.ncomp.servers.openstack.loc.logging.OpenStackLocation");
+ EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocation");
}
}
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocationOperationEnum.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocationOperationEnum.java
index 5c37fc3..0b88fa0 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocationOperationEnum.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/loc/logging/OpenStackLocationOperationEnum.java
@@ -1,77 +1,45 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.openstack.loc.logging;
import org.openecomp.entity.EcompOperationEnum;
public enum OpenStackLocationOperationEnum implements EcompOperationEnum {
- createNetwork,
- createSubnet,
- createPort,
- createRouter,
- deleteNetwork,
- deleteSubnet,
- deletePort,
- deleteRouter,
- associateFloatingIp,
- createServer,
- deleteServer,
- createKeyPair,
- delete,
- createFlavor,
- createSecurityGroup,
- serverAction,
- deployVmType,
- undeployVmType,
- deployUser,
- undeployUser,
- createAlarm,
- deleteAlarm,
- poll,
- mergeLocation,
- REMOTE_createNetwork,
- REMOTE_createSubnet,
- REMOTE_createPort,
- REMOTE_createRouter,
- REMOTE_deleteNetwork,
- REMOTE_deleteSubnet,
- REMOTE_deletePort,
- REMOTE_deleteRouter,
- REMOTE_associateFloatingIp,
- REMOTE_createServer,
- REMOTE_deleteServer,
- REMOTE_createKeyPair,
- REMOTE_delete,
- REMOTE_createFlavor,
- REMOTE_createSecurityGroup,
- REMOTE_serverAction,
- REMOTE_deployVmType,
- REMOTE_undeployVmType,
- REMOTE_deployUser,
- REMOTE_undeployUser,
- REMOTE_createAlarm,
- REMOTE_deleteAlarm,
- REMOTE_poll,
- REMOTE_mergeLocation;
+ OpenStackLocation_createNetwork("OpenStackLocation@createNetwork"),
+ OpenStackLocation_createSubnet("OpenStackLocation@createSubnet"),
+ OpenStackLocation_createPort("OpenStackLocation@createPort"),
+ OpenStackLocation_createRouter("OpenStackLocation@createRouter"),
+ OpenStackLocation_deleteNetwork("OpenStackLocation@deleteNetwork"),
+ OpenStackLocation_deleteSubnet("OpenStackLocation@deleteSubnet"),
+ OpenStackLocation_deletePort("OpenStackLocation@deletePort"),
+ OpenStackLocation_deleteRouter("OpenStackLocation@deleteRouter"),
+ OpenStackLocation_associateFloatingIp("OpenStackLocation@associateFloatingIp"),
+ OpenStackLocation_createServer("OpenStackLocation@createServer"),
+ OpenStackLocation_deleteServer("OpenStackLocation@deleteServer"),
+ OpenStackLocation_createKeyPair("OpenStackLocation@createKeyPair"),
+ OpenStackLocation_delete("OpenStackLocation@delete"),
+ OpenStackLocation_createFlavor("OpenStackLocation@createFlavor"),
+ OpenStackLocation_createSecurityGroup("OpenStackLocation@createSecurityGroup"),
+ OpenStackLocation_serverAction("OpenStackLocation@serverAction"),
+ OpenStackLocation_deployVmType("OpenStackLocation@deployVmType"),
+ OpenStackLocation_undeployVmType("OpenStackLocation@undeployVmType"),
+ OpenStackLocation_deployUser("OpenStackLocation@deployUser"),
+ OpenStackLocation_undeployUser("OpenStackLocation@undeployUser"),
+ OpenStackLocation_createAlarm("OpenStackLocation@createAlarm"),
+ OpenStackLocation_deleteAlarm("OpenStackLocation@deleteAlarm"),
+ OpenStackLocation_poll("OpenStackLocation@poll"),
+ OpenStackLocation_mergeLocation("OpenStackLocation@mergeLocation") ;
+
+
+ private String n;
+
+ private OpenStackLocationOperationEnum(String n) {
+ this.n = n;
+ }
+
+ @Override
+ public String toString() {
+ return n;
+ }
+
}
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptor.properties b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptor.properties
index 47c5487..b0eb8e5 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptor.properties
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptor.properties
@@ -1,6 +1,6 @@
POLLING_FAILED=\
- NCOMP-OPENSTACK-POLLING-FAILED-5001W|\
+ POLLING_FAILED-NCOMP-OPENSTACK-POLLING-FAILED-5001W|\
{0}|\
Verify Openstack setup.|\
Openstack Polling fails.
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptorMessageEnum.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptorMessageEnum.java
index e412d6d..6190c89 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptorMessageEnum.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptorMessageEnum.java
@@ -1,25 +1,4 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.openstack.logging;
import com.att.eelf.i18n.EELFResourceManager;
@@ -30,6 +9,6 @@ public enum OpenStackAdaptorMessageEnum implements EcompMessageEnum {
POLLING_FAILED;
static {
- EELFResourceManager.loadMessageBundle("org.openecomp.ncomp.servers.openstack.logging.OpenStackAdaptor");
+ EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptor");
}
}
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptorOperationEnum.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptorOperationEnum.java
index e83d584..c5231bd 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptorOperationEnum.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackAdaptorOperationEnum.java
@@ -1,30 +1,22 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.openstack.logging;
import org.openecomp.entity.EcompOperationEnum;
public enum OpenStackAdaptorOperationEnum implements EcompOperationEnum {
- POLLING;
+ POLLING("POLLING") ;
+
+
+ private String n;
+
+ private OpenStackAdaptorOperationEnum(String n) {
+ this.n = n;
+ }
+
+ @Override
+ public String toString() {
+ return n;
+ }
+
}
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackController.properties b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackController.properties
index 5825f57..102f6a9 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackController.properties
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackController.properties
@@ -1,18 +1,18 @@
dummy=\
- null|\
+ dummy-null|\
null|\
null|\
null
-uploadOpenstackConfiguration=\
- uploadOpenstackConfiguration-FAILED-5001W|\
+REQUEST_FAILED_uploadOpenstackConfiguration=\
+ REQUEST-FAILED-uploadOpenstackConfiguration-4001W|\
{0}|\
null|\
Operation Failed with Exception
-REMOTE_uploadOpenstackConfiguration=\
- REMOTE-uploadOpenstackConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_uploadOpenstackConfiguration=\
+ REMOTE-CALL-FAILED-uploadOpenstackConfiguration-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackControllerMessageEnum.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackControllerMessageEnum.java
index ee93bf2..9e24296 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackControllerMessageEnum.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackControllerMessageEnum.java
@@ -1,25 +1,4 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.openstack.logging;
import com.att.eelf.i18n.EELFResourceManager;
@@ -28,10 +7,10 @@ import org.openecomp.logger.EcompMessageEnum;
public enum OpenStackControllerMessageEnum implements EcompMessageEnum {
dummy,
- uploadOpenstackConfiguration,
- REMOTE_uploadOpenstackConfiguration;
+ REQUEST_FAILED_uploadOpenstackConfiguration,
+ REMOTE_CALL_FAILED_uploadOpenstackConfiguration;
static {
- EELFResourceManager.loadMessageBundle("org.openecomp.ncomp.servers.openstack.logging.OpenStackController");
+ EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/servers/openstack/logging/OpenStackController");
}
}
diff --git a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackControllerOperationEnum.java b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackControllerOperationEnum.java
index 069aa56..fcb82c8 100644
--- a/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackControllerOperationEnum.java
+++ b/ncomp-openstack-controller/src/main/sirius-gen/org/openecomp/ncomp/servers/openstack/logging/OpenStackControllerOperationEnum.java
@@ -1,31 +1,22 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.openstack.logging;
import org.openecomp.entity.EcompOperationEnum;
public enum OpenStackControllerOperationEnum implements EcompOperationEnum {
- uploadOpenstackConfiguration,
- REMOTE_uploadOpenstackConfiguration;
+ OpenStackController_uploadOpenstackConfiguration("OpenStackController@uploadOpenstackConfiguration") ;
+
+
+ private String n;
+
+ private OpenStackControllerOperationEnum(String n) {
+ this.n = n;
+ }
+
+ @Override
+ public String toString() {
+ return n;
+ }
+
}
diff --git a/ncomp-openstack-feature/.project b/ncomp-openstack-feature/.project
deleted file mode 100644
index 037a3a7..0000000
--- a/ncomp-openstack-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>ncomp-openstack-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/ncomp-openstack-feature/LICENSE.txt b/ncomp-openstack-feature/LICENSE.txt
deleted file mode 100644
index 30471b5..0000000
--- a/ncomp-openstack-feature/LICENSE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.
diff --git a/ncomp-openstack-model/META-INF/MANIFEST.MF b/ncomp-openstack-model/META-INF/MANIFEST.MF
index 3919f9b..87ee4e2 100644
--- a/ncomp-openstack-model/META-INF/MANIFEST.MF
+++ b/ncomp-openstack-model/META-INF/MANIFEST.MF
@@ -29,9 +29,5 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.xtext.xbase.lib,
org.eclipse.emf.ecore.xcore.lib,
- ncomp-openstack-model;visibility:=reexport,
- ncomp-utils-java;bundle-version="0.1.0",
- ncomp-core-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-sirius-manager-model;visibility:=reexport,
- ncomp-sirius-manager-server;bundle-version="0.1.0"
+ ncomp-openstack-model;visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/ncomp-openstack-model/pom.xml b/ncomp-openstack-model/pom.xml
index de9a8d0..8864970 100644
--- a/ncomp-openstack-model/pom.xml
+++ b/ncomp-openstack-model/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.openecomp.ncomp.maven</groupId>
<artifactId>ncomp-maven-xcore</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../dcae-org.openecomp.ncomp.maven/ncomp-maven-xcore</relativePath>
</parent>
<dependencies>
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/OpenStackController.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/OpenStackController.java
index 3c57edd..4b7c3f5 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/OpenStackController.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/OpenStackController.java
@@ -37,12 +37,12 @@ import org.json.JSONObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.OpenStackController#getLocations <em>Locations</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.OpenStackController#getVmTypes <em>Vm Types</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.OpenStackController#getUsers <em>Users</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.OpenstackPackage#getOpenStackController()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/OpenstackPackage.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/OpenstackPackage.java
index 4d08c00..512919a 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/OpenstackPackage.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/OpenstackPackage.java
@@ -40,6 +40,24 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
* @see org.openecomp.ncomp.openstack.OpenstackFactory
* @model kind="package"
* annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-openstack-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp'"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerAlarm.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerAlarm.java
index 87b9c11..e28c3f3 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerAlarm.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerAlarm.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerAlarm#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerAlarm#getUser_id <em>User id</em>}</li>
@@ -48,7 +49,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerAlarm#getRepeat_actions <em>Repeat actions</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerAlarm#getTime_constraints <em>Time constraints</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getCeilometerAlarm()
* @model abstract="true"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerFilter.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerFilter.java
index 9086e37..b4c0a77 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerFilter.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerFilter.java
@@ -34,13 +34,13 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerFilter#getOperation <em>Operation</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerFilter#getValue <em>Value</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerFilter#getField <em>Field</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerFilter#getFilters <em>Filters</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getCeilometerFilter()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerOrderedBy.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerOrderedBy.java
index c0ed74a..65837de 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerOrderedBy.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerOrderedBy.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerOrderedBy#getField <em>Field</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerOrderedBy#getDirection <em>Direction</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getCeilometerOrderedBy()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerPackage.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerPackage.java
index f6f33e5..edc5b17 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerPackage.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerPackage.java
@@ -43,6 +43,24 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerFactory
* @model kind="package"
* annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-openstack-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.openstack'"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerProject.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerProject.java
index caa451e..9e5eca8 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerProject.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerProject.java
@@ -34,12 +34,12 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerProject#getAlarms <em>Alarms</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerProject#getResources <em>Resources</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerProject#getMeters <em>Meters</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getCeilometerProject()
* @model abstract="true"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerQuery.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerQuery.java
index 0cc5b71..9ea2204 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerQuery.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerQuery.java
@@ -34,12 +34,12 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerQuery#getFilter <em>Filter</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerQuery#getOrderby <em>Orderby</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerQuery#getLimit <em>Limit</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getCeilometerQuery()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerResource.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerResource.java
index fe0e704..dcff6fd 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerResource.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerResource.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerResource#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerResource#getUser_id <em>User id</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerResource#getLinks <em>Links</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerResource#getMetadata <em>Metadata</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getCeilometerResource()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerSample.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerSample.java
index c0abee2..e7c8c54 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerSample.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerSample.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerSample#getCounter_name <em>Counter name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerSample#getUser_id <em>User id</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerSample#getCounter_volume <em>Counter volume</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerSample#getProject_id <em>Project id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getCeilometerSample()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerService.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerService.java
index 4133b4b..2c53819 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerService.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerService.java
@@ -33,11 +33,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerService#getCeilometerAvailableCapabilites <em>Ceilometer Available Capabilites</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerService#getCeilometerUnavailableCapabilites <em>Ceilometer Unavailable Capabilites</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getCeilometerService()
* @model abstract="true"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerThresholdAlarm.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerThresholdAlarm.java
index 983c0b3..49a09f8 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerThresholdAlarm.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerThresholdAlarm.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.openstack.ceilometer;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerThresholdAlarm#getThreshold_rule <em>Threshold rule</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getCeilometerThresholdAlarm()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerThresholdAlarmRule.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerThresholdAlarmRule.java
index 4a50de6..6aee05d 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerThresholdAlarmRule.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/CeilometerThresholdAlarmRule.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerThresholdAlarmRule#getMeter_name <em>Meter name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerThresholdAlarmRule#getEvaluation_periods <em>Evaluation periods</em>}</li>
@@ -44,7 +45,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerThresholdAlarmRule#getComparison_operator <em>Comparison operator</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.CeilometerThresholdAlarmRule#getExclude_outliers <em>Exclude outliers</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getCeilometerThresholdAlarmRule()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/SampleRequest.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/SampleRequest.java
index 47640b7..303facb 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/SampleRequest.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/SampleRequest.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.openstack.ceilometer;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.SampleRequest#getQuery <em>Query</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.ceilometer.CeilometerPackage#getSampleRequest()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerAlarmImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerAlarmImpl.java
index 9e989b2..cc89e0e 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerAlarmImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerAlarmImpl.java
@@ -40,6 +40,7 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerAlarmImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerAlarmImpl#getUser_id <em>User id</em>}</li>
@@ -54,7 +55,6 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerAlarmImpl#getRepeat_actions <em>Repeat actions</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerAlarmImpl#getTime_constraints <em>Time constraints</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerFilterImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerFilterImpl.java
index e57e93e..a7d0d91 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerFilterImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerFilterImpl.java
@@ -48,13 +48,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerFilterImpl#getOperation <em>Operation</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerFilterImpl#getValue <em>Value</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerFilterImpl#getField <em>Field</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerFilterImpl#getFilters <em>Filters</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerMeterImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerMeterImpl.java
index 242ab27..2e3e6b6 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerMeterImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerMeterImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Meter</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerOrderedByImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerOrderedByImpl.java
index fd4f9c4..bd15d85 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerOrderedByImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerOrderedByImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerOrderedByImpl#getField <em>Field</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerOrderedByImpl#getDirection <em>Direction</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerProjectImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerProjectImpl.java
index 5c1c6c0..dc1f5f0 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerProjectImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerProjectImpl.java
@@ -49,12 +49,12 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerProjectImpl#getAlarms <em>Alarms</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerProjectImpl#getResources <em>Resources</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerProjectImpl#getMeters <em>Meters</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerQueryImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerQueryImpl.java
index cd26d2a..dc77023 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerQueryImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerQueryImpl.java
@@ -50,12 +50,12 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerQueryImpl#getFilter <em>Filter</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerQueryImpl#getOrderby <em>Orderby</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerQueryImpl#getLimit <em>Limit</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerRequestImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerRequestImpl.java
index 4dd5bdc..512d998 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerRequestImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerRequestImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Request</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerResourceImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerResourceImpl.java
index 044097e..0b249ce 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerResourceImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerResourceImpl.java
@@ -47,6 +47,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerResourceImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerResourceImpl#getUser_id <em>User id</em>}</li>
@@ -56,7 +57,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerResourceImpl#getLinks <em>Links</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerResourceImpl#getMetadata <em>Metadata</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerSampleImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerSampleImpl.java
index d78ae86..74e3562 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerSampleImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerSampleImpl.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerSampleImpl#getCounter_name <em>Counter name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerSampleImpl#getUser_id <em>User id</em>}</li>
@@ -53,7 +54,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerSampleImpl#getCounter_volume <em>Counter volume</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerSampleImpl#getProject_id <em>Project id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerServiceImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerServiceImpl.java
index 2bbd7bc..82d8c40 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerServiceImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerServiceImpl.java
@@ -42,11 +42,11 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerServiceImpl#getCeilometerAvailableCapabilites <em>Ceilometer Available Capabilites</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerServiceImpl#getCeilometerUnavailableCapabilites <em>Ceilometer Unavailable Capabilites</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerThresholdAlarmImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerThresholdAlarmImpl.java
index 76b8b78..e679c03 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerThresholdAlarmImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerThresholdAlarmImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerThresholdAlarmImpl#getThreshold_rule <em>Threshold rule</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerThresholdAlarmRuleImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerThresholdAlarmRuleImpl.java
index f00512c..2234758 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerThresholdAlarmRuleImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CeilometerThresholdAlarmRuleImpl.java
@@ -45,6 +45,7 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerThresholdAlarmRuleImpl#getMeter_name <em>Meter name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerThresholdAlarmRuleImpl#getEvaluation_periods <em>Evaluation periods</em>}</li>
@@ -55,7 +56,6 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerThresholdAlarmRuleImpl#getComparison_operator <em>Comparison operator</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.CeilometerThresholdAlarmRuleImpl#getExclude_outliers <em>Exclude outliers</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CreateAlarmRequestImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CreateAlarmRequestImpl.java
index baf0ede..20ab034 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CreateAlarmRequestImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/CreateAlarmRequestImpl.java
@@ -32,8 +32,6 @@ import org.eclipse.emf.ecore.EClass;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Create Alarm Request</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/SampleRequestImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/SampleRequestImpl.java
index f8b2209..ce2c608 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/SampleRequestImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/impl/SampleRequestImpl.java
@@ -41,10 +41,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.ceilometer.impl.SampleRequestImpl#getQuery <em>Query</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/util/CeilometerSwitch.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/util/CeilometerSwitch.java
index 6e3efb0..7ba99ff 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/util/CeilometerSwitch.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/ceilometer/util/CeilometerSwitch.java
@@ -71,7 +71,7 @@ public class CeilometerSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Address.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Address.java
index 4a40fd3..6a925e5 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Address.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Address.java
@@ -32,13 +32,13 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Address#getVersion <em>Version</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Address#getAddr <em>Addr</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Address#getOS_EXT_IPS_MAC_mac_addr <em>OS EXT IPS MAC mac addr</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Address#getOS_EXT_IPS_type <em>OS EXT IPS type</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getAddress()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Addresses.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Addresses.java
index 62fffe8..0c3783d 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Addresses.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Addresses.java
@@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Addresses#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Addresses#getIps <em>Ips</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getAddresses()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/ComputePackage.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/ComputePackage.java
index c6ca7c1..9bcc58c 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/ComputePackage.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/ComputePackage.java
@@ -43,6 +43,24 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
* @see org.openecomp.ncomp.openstack.compute.ComputeFactory
* @model kind="package"
* annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-openstack-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.openstack'"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Fault.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Fault.java
index ae430d4..034d4b4 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Fault.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Fault.java
@@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Fault#getMessage <em>Message</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Fault#getCreated <em>Created</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Fault#getCode <em>Code</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getFault()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Flavor.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Flavor.java
index 26a5f95..3f7411c 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Flavor.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Flavor.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Flavor#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Flavor#getName <em>Name</em>}</li>
@@ -47,7 +48,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.openecomp.ncomp.openstack.compute.Flavor#isOs_flavor_access_is_public <em>Os flavor access is public</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Flavor#getLinks <em>Links</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getFlavor()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/FloatingIp.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/FloatingIp.java
index b842a4b..9ad88da 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/FloatingIp.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/FloatingIp.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.FloatingIp#getInstance_id <em>Instance id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.FloatingIp#getIp <em>Ip</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.openecomp.ncomp.openstack.compute.FloatingIp#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.FloatingIp#getPool <em>Pool</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getFloatingIp()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Image.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Image.java
index 86f7f4d..1dd89dc 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Image.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Image.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Image#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Image#getName <em>Name</em>}</li>
@@ -50,7 +51,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.openecomp.ncomp.openstack.compute.Image#getLinks <em>Links</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Image#getMetadata <em>Metadata</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getImage()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/KeyPair.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/KeyPair.java
index d9ca5a8..f2b4b84 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/KeyPair.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/KeyPair.java
@@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.KeyPair#getPublic_key <em>Public key</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.KeyPair#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.KeyPair#getFingerprint <em>Fingerprint</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getKeyPair()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Link.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Link.java
index 3e09988..d75044b 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Link.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Link.java
@@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Link#getRel <em>Rel</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Link#getHref <em>Href</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Link#getType <em>Type</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getLink()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Metadata.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Metadata.java
index 49bfa6e..d4b4221 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Metadata.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Metadata.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Metadata#getKey <em>Key</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Metadata#getValue <em>Value</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getMetadata()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestFlavor.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestFlavor.java
index 9d53f4b..12db3b1 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestFlavor.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestFlavor.java
@@ -33,10 +33,10 @@ import org.openecomp.ncomp.openstack.core.VirtualMachineType;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.OpenstackRequestFlavor#getVmType <em>Vm Type</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getOpenstackRequestFlavor()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestKeyPair.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestKeyPair.java
index 71f1e0f..d6ea707 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestKeyPair.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestKeyPair.java
@@ -33,10 +33,10 @@ import org.openecomp.ncomp.openstack.core.OpenStackRequest;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.OpenstackRequestKeyPair#getUser <em>User</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getOpenstackRequestKeyPair()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestNewServer.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestNewServer.java
index 00c9bae..410206e 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestNewServer.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestNewServer.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.OpenstackRequestNewServer#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.OpenstackRequestNewServer#getHypervisor <em>Hypervisor</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.compute.OpenstackRequestNewServer#getFloatingIp <em>Floating Ip</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.OpenstackRequestNewServer#getVmType <em>Vm Type</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getOpenstackRequestNewServer()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestSecurityGroup.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestSecurityGroup.java
index 45a7434..6943730 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestSecurityGroup.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestSecurityGroup.java
@@ -33,10 +33,10 @@ import org.openecomp.ncomp.openstack.core.VirtualMachineType;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.OpenstackRequestSecurityGroup#getVmType <em>Vm Type</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getOpenstackRequestSecurityGroup()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestServerAction.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestServerAction.java
index 4eb1d57..9e44172 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestServerAction.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/OpenstackRequestServerAction.java
@@ -32,11 +32,11 @@ import org.openecomp.ncomp.openstack.core.OpenStackRequest;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.OpenstackRequestServerAction#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.OpenstackRequestServerAction#getAction <em>Action</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getOpenstackRequestServerAction()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Personality.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Personality.java
index 42e5156..d933180 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Personality.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Personality.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Personality#getPath <em>Path</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Personality#getContents <em>Contents</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getPersonality()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Reference.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Reference.java
index daf8be0..25bd46f 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Reference.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Reference.java
@@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Reference#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Reference#getLinks <em>Links</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getReference()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityGroup.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityGroup.java
index 7a585d8..a3bbd06 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityGroup.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityGroup.java
@@ -34,13 +34,13 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.SecurityGroup#getRules <em>Rules</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.SecurityGroup#getTenant_id <em>Tenant id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.SecurityGroup#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.SecurityGroup#getDescription <em>Description</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getSecurityGroup()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityRange.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityRange.java
index 7dd610c..ef3e0db 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityRange.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityRange.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.SecurityRange#getCidr <em>Cidr</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getSecurityRange()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityRule.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityRule.java
index e4b1184..d24344a 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityRule.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/SecurityRule.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.SecurityRule#getFrom_port <em>From port</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.SecurityRule#getGroup <em>Group</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.openecomp.ncomp.openstack.compute.SecurityRule#getIp_range <em>Ip range</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.SecurityRule#getId <em>Id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getSecurityRule()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Server.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Server.java
index 60e8f28..a4b6a2e 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Server.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Server.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Server#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Server#getTenant_id <em>Tenant id</em>}</li>
@@ -65,7 +66,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.openecomp.ncomp.openstack.compute.Server#getLinks <em>Links</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Server#getFault <em>Fault</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getServer()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Volume.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Volume.java
index 0f89f5d..b918b20 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Volume.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/Volume.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.Volume#getStatus <em>Status</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Volume#getDisplay_name <em>Display name</em>}</li>
@@ -47,7 +48,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.compute.Volume#getSnapshot_id <em>Snapshot id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.Volume#getDisplay_description <em>Display description</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getVolume()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/VolumeAttachment.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/VolumeAttachment.java
index 862b337..e6c9acc 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/VolumeAttachment.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/VolumeAttachment.java
@@ -32,13 +32,13 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.VolumeAttachment#getDevice <em>Device</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.VolumeAttachment#getServer_id <em>Server id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.VolumeAttachment#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.VolumeAttachment#getVolume_id <em>Volume id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.compute.ComputePackage#getVolumeAttachment()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/AddressImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/AddressImpl.java
index 23c7319..91130bb 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/AddressImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/AddressImpl.java
@@ -39,13 +39,13 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.AddressImpl#getVersion <em>Version</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.AddressImpl#getAddr <em>Addr</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.AddressImpl#getOS_EXT_IPS_MAC_mac_addr <em>OS EXT IPS MAC mac addr</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.AddressImpl#getOS_EXT_IPS_type <em>OS EXT IPS type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/AddressesImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/AddressesImpl.java
index 246e4c1..fa52905 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/AddressesImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/AddressesImpl.java
@@ -49,11 +49,11 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.AddressesImpl#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.AddressesImpl#getIps <em>Ips</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ComputeServiceImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ComputeServiceImpl.java
index 3e3a4b4..220caa2 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ComputeServiceImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ComputeServiceImpl.java
@@ -41,8 +41,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Service</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FaultImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FaultImpl.java
index 1946236..afdfeca 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FaultImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FaultImpl.java
@@ -39,12 +39,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FaultImpl#getMessage <em>Message</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FaultImpl#getCreated <em>Created</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FaultImpl#getCode <em>Code</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FlavorImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FlavorImpl.java
index 0df02c4..2f7046b 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FlavorImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FlavorImpl.java
@@ -49,6 +49,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FlavorImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FlavorImpl#getName <em>Name</em>}</li>
@@ -62,7 +63,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FlavorImpl#isOs_flavor_access_is_public <em>Os flavor access is public</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FlavorImpl#getLinks <em>Links</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FloatingIpImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FloatingIpImpl.java
index 89bab49..658a432 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FloatingIpImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/FloatingIpImpl.java
@@ -39,6 +39,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FloatingIpImpl#getInstance_id <em>Instance id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FloatingIpImpl#getIp <em>Ip</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FloatingIpImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.FloatingIpImpl#getPool <em>Pool</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ImageImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ImageImpl.java
index b873aa6..1240a1f 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ImageImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ImageImpl.java
@@ -51,6 +51,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.ImageImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.ImageImpl#getName <em>Name</em>}</li>
@@ -67,7 +68,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.ImageImpl#getLinks <em>Links</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.ImageImpl#getMetadata <em>Metadata</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/KeyPairImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/KeyPairImpl.java
index dcb166c..1f625d4 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/KeyPairImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/KeyPairImpl.java
@@ -39,12 +39,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.KeyPairImpl#getPublic_key <em>Public key</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.KeyPairImpl#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.KeyPairImpl#getFingerprint <em>Fingerprint</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/LinkImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/LinkImpl.java
index 9b7c106..358fd55 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/LinkImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/LinkImpl.java
@@ -39,12 +39,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.LinkImpl#getRel <em>Rel</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.LinkImpl#getHref <em>Href</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.LinkImpl#getType <em>Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/MetadataImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/MetadataImpl.java
index b49d692..e1659ec 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/MetadataImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/MetadataImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.MetadataImpl#getKey <em>Key</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.MetadataImpl#getValue <em>Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestFlavorImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestFlavorImpl.java
index 8df633f..e50e2a4 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestFlavorImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestFlavorImpl.java
@@ -44,10 +44,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.OpenstackRequestFlavorImpl#getVmType <em>Vm Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestKeyPairImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestKeyPairImpl.java
index 898ea93..119750c 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestKeyPairImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestKeyPairImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.OpenstackRequestKeyPairImpl#getUser <em>User</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestNewServerImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestNewServerImpl.java
index cc7aa34..217dcd1 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestNewServerImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestNewServerImpl.java
@@ -50,6 +50,7 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.OpenstackRequestNewServerImpl#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.OpenstackRequestNewServerImpl#getHypervisor <em>Hypervisor</em>}</li>
@@ -60,7 +61,6 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.OpenstackRequestNewServerImpl#getFloatingIp <em>Floating Ip</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.OpenstackRequestNewServerImpl#getVmType <em>Vm Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestPollImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestPollImpl.java
index 3d7787d..5a71fb4 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestPollImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestPollImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Openstack Request Poll</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestSecurityGroupImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestSecurityGroupImpl.java
index 4e0ba54..f4fbd6c 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestSecurityGroupImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestSecurityGroupImpl.java
@@ -44,10 +44,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.OpenstackRequestSecurityGroupImpl#getVmType <em>Vm Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestServerActionImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestServerActionImpl.java
index 412ac12..6305bb5 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestServerActionImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/OpenstackRequestServerActionImpl.java
@@ -40,11 +40,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.OpenstackRequestServerActionImpl#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.OpenstackRequestServerActionImpl#getAction <em>Action</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/PersonalityImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/PersonalityImpl.java
index 8b2b26d..c8db4a9 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/PersonalityImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/PersonalityImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.PersonalityImpl#getPath <em>Path</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.PersonalityImpl#getContents <em>Contents</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ReferenceImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ReferenceImpl.java
index 6295315..5243c7b 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ReferenceImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ReferenceImpl.java
@@ -49,11 +49,11 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.ReferenceImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.ReferenceImpl#getLinks <em>Links</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityGroupImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityGroupImpl.java
index c99d77c..6c19f90 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityGroupImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityGroupImpl.java
@@ -50,13 +50,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.SecurityGroupImpl#getRules <em>Rules</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.SecurityGroupImpl#getTenant_id <em>Tenant id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.SecurityGroupImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.SecurityGroupImpl#getDescription <em>Description</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityRangeImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityRangeImpl.java
index 8796364..0015fe7 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityRangeImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityRangeImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.SecurityRangeImpl#getCidr <em>Cidr</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityRuleImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityRuleImpl.java
index cbb2ccf..9534e95 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityRuleImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/SecurityRuleImpl.java
@@ -43,6 +43,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.SecurityRuleImpl#getFrom_port <em>From port</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.SecurityRuleImpl#getGroup <em>Group</em>}</li>
@@ -52,7 +53,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.SecurityRuleImpl#getIp_range <em>Ip range</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.SecurityRuleImpl#getId <em>Id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ServerImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ServerImpl.java
index e7a43ae..c2648af 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ServerImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/ServerImpl.java
@@ -54,6 +54,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.ServerImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.ServerImpl#getTenant_id <em>Tenant id</em>}</li>
@@ -85,7 +86,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.ServerImpl#getLinks <em>Links</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.ServerImpl#getFault <em>Fault</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/VolumeAttachmentImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/VolumeAttachmentImpl.java
index abdd4a5..960340b 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/VolumeAttachmentImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/VolumeAttachmentImpl.java
@@ -39,13 +39,13 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.VolumeAttachmentImpl#getDevice <em>Device</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.VolumeAttachmentImpl#getServer_id <em>Server id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.VolumeAttachmentImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.VolumeAttachmentImpl#getVolume_id <em>Volume id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/VolumeImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/VolumeImpl.java
index d443043..460e2e4 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/VolumeImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/impl/VolumeImpl.java
@@ -51,6 +51,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.VolumeImpl#getStatus <em>Status</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.VolumeImpl#getDisplay_name <em>Display name</em>}</li>
@@ -64,7 +65,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.VolumeImpl#getSnapshot_id <em>Snapshot id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.compute.impl.VolumeImpl#getDisplay_description <em>Display description</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/util/ComputeSwitch.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/util/ComputeSwitch.java
index 4eba2cb..8205f7f 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/util/ComputeSwitch.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/compute/util/ComputeSwitch.java
@@ -72,7 +72,7 @@ public class ComputeSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/CorePackage.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/CorePackage.java
index a67d8db..e9af72b 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/CorePackage.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/CorePackage.java
@@ -41,6 +41,24 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
* @see org.openecomp.ncomp.openstack.core.CoreFactory
* @model kind="package"
* annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-openstack-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.openstack'"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/OpenStackRequest.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/OpenStackRequest.java
index 9bd9329..d3feca4 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/OpenStackRequest.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/OpenStackRequest.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.core.OpenStackRequest#getProjectName <em>Project Name</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.core.CorePackage#getOpenStackRequest()
* @model abstract="true"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/OpenstackRequestDelete.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/OpenstackRequestDelete.java
index ec7b0ba..483421f 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/OpenstackRequestDelete.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/OpenstackRequestDelete.java
@@ -31,11 +31,11 @@ package org.openecomp.ncomp.openstack.core;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.core.OpenstackRequestDelete#getObjectType <em>Object Type</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.OpenstackRequestDelete#getObjectName <em>Object Name</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.core.CorePackage#getOpenstackRequestDelete()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/SecurityRule.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/SecurityRule.java
index ed5b13c..d6ef7ec 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/SecurityRule.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/SecurityRule.java
@@ -32,13 +32,13 @@ import org.openecomp.ncomp.core.NamedEntity;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.core.SecurityRule#getPortRangeStart <em>Port Range Start</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.SecurityRule#getPortRangeEnd <em>Port Range End</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.SecurityRule#getPrefix <em>Prefix</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.SecurityRule#getIpProtocol <em>Ip Protocol</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.core.CorePackage#getSecurityRule()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/SecurityRuleProtocol.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/SecurityRuleProtocol.java
index 1650fbb..b790318 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/SecurityRuleProtocol.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/SecurityRuleProtocol.java
@@ -165,6 +165,8 @@ public enum SecurityRuleProtocol implements Enumerator {
* Returns the '<em><b>Security Rule Protocol</b></em>' literal with the specified literal value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static SecurityRuleProtocol get(String literal) {
@@ -181,6 +183,8 @@ public enum SecurityRuleProtocol implements Enumerator {
* Returns the '<em><b>Security Rule Protocol</b></em>' literal with the specified name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static SecurityRuleProtocol getByName(String name) {
@@ -197,6 +201,8 @@ public enum SecurityRuleProtocol implements Enumerator {
* Returns the '<em><b>Security Rule Protocol</b></em>' literal with the specified integer value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static SecurityRuleProtocol get(int value) {
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/VirtualMachineType.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/VirtualMachineType.java
index 131f6e8..1099a54 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/VirtualMachineType.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/VirtualMachineType.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.core.VirtualMachineType#getDescription <em>Description</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.VirtualMachineType#getNumberOfCores <em>Number Of Cores</em>}</li>
@@ -49,7 +50,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.core.VirtualMachineType#getIncomingSecurityRules <em>Incoming Security Rules</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.VirtualMachineType#getOutboundSecurityRules <em>Outbound Security Rules</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.core.CorePackage#getVirtualMachineType()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenStackRequestImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenStackRequestImpl.java
index e83f9ec..929c241 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenStackRequestImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenStackRequestImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.core.impl.OpenStackRequestImpl#getProjectName <em>Project Name</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenstackRequestDeleteImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenstackRequestDeleteImpl.java
index 18291e7..53da5c6 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenstackRequestDeleteImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenstackRequestDeleteImpl.java
@@ -38,11 +38,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.core.impl.OpenstackRequestDeleteImpl#getObjectType <em>Object Type</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.impl.OpenstackRequestDeleteImpl#getObjectName <em>Object Name</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenstackRequestPollImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenstackRequestPollImpl.java
index a28f3c8..e0cf73a 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenstackRequestPollImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/OpenstackRequestPollImpl.java
@@ -32,8 +32,6 @@ import org.eclipse.emf.ecore.EClass;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Openstack Request Poll</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/SecurityRuleImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/SecurityRuleImpl.java
index 4b85fff..79158ec 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/SecurityRuleImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/SecurityRuleImpl.java
@@ -41,13 +41,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.core.impl.SecurityRuleImpl#getPortRangeStart <em>Port Range Start</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.impl.SecurityRuleImpl#getPortRangeEnd <em>Port Range End</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.impl.SecurityRuleImpl#getPrefix <em>Prefix</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.impl.SecurityRuleImpl#getIpProtocol <em>Ip Protocol</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/VirtualMachineTypeImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/VirtualMachineTypeImpl.java
index 014c99d..423f2be 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/VirtualMachineTypeImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/impl/VirtualMachineTypeImpl.java
@@ -44,6 +44,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.core.impl.VirtualMachineTypeImpl#getDescription <em>Description</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.impl.VirtualMachineTypeImpl#getNumberOfCores <em>Number Of Cores</em>}</li>
@@ -58,7 +59,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.core.impl.VirtualMachineTypeImpl#getIncomingSecurityRules <em>Incoming Security Rules</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.core.impl.VirtualMachineTypeImpl#getOutboundSecurityRules <em>Outbound Security Rules</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/util/CoreSwitch.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/util/CoreSwitch.java
index 2360076..77d5ba2 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/util/CoreSwitch.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/core/util/CoreSwitch.java
@@ -70,7 +70,7 @@ public class CoreSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/impl/OpenStackControllerImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/impl/OpenStackControllerImpl.java
index b0fcb92..1a63a76 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/impl/OpenStackControllerImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/impl/OpenStackControllerImpl.java
@@ -45,12 +45,12 @@ import org.json.JSONObject;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.impl.OpenStackControllerImpl#getLocations <em>Locations</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.impl.OpenStackControllerImpl#getVmTypes <em>Vm Types</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.impl.OpenStackControllerImpl#getUsers <em>Users</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/Hypervisor.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/Hypervisor.java
index 154c46b..6593730 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/Hypervisor.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/Hypervisor.java
@@ -32,6 +32,7 @@ import org.openecomp.ncomp.core.NamedEntity;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.Hypervisor#getService <em>Service</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.Hypervisor#getHost_ip <em>Host ip</em>}</li>
@@ -52,7 +53,6 @@ import org.openecomp.ncomp.core.NamedEntity;
* <li>{@link org.openecomp.ncomp.openstack.location.Hypervisor#getFree_ram_mb <em>Free ram mb</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.Hypervisor#getId <em>Id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.location.LocationPackage#getHypervisor()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuInfo.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuInfo.java
index 8cfcc52..ff4c964 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuInfo.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuInfo.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuInfo#getVendor <em>Vendor</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuInfo#getModel <em>Model</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuInfo#getFeatures <em>Features</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuInfo#getTopology <em>Topology</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.location.LocationPackage#getHypervisorCpuInfo()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuTopology.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuTopology.java
index d54569f..1700db8 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuTopology.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorCpuTopology.java
@@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuTopology#getCores <em>Cores</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuTopology#getThreads <em>Threads</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.HypervisorCpuTopology#getSockets <em>Sockets</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.location.LocationPackage#getHypervisorCpuTopology()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorService.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorService.java
index 5fd546b..9849545 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorService.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/HypervisorService.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.HypervisorService#getHost <em>Host</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.HypervisorService#getId <em>Id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.location.LocationPackage#getHypervisorService()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/LocationPackage.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/LocationPackage.java
index ccbef80..3f2fa5d 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/LocationPackage.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/LocationPackage.java
@@ -44,6 +44,24 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
* @see org.openecomp.ncomp.openstack.location.LocationFactory
* @model kind="package"
* annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-openstack-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.openstack'"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackLocation.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackLocation.java
index 0d15f9e..cab63c5 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackLocation.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackLocation.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.OpenStackLocation#getVersion <em>Version</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.OpenStackLocation#isRemoteLocation <em>Remote Location</em>}</li>
@@ -57,7 +58,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.location.OpenStackLocation#getFlavors <em>Flavors</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.OpenStackLocation#getHypervisors <em>Hypervisors</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.location.LocationPackage#getOpenStackLocation()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackProject.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackProject.java
index 7cb85a2..dc0617a 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackProject.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackProject.java
@@ -49,6 +49,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.OpenStackProject#getID <em>ID</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.OpenStackProject#getAdminUser <em>Admin User</em>}</li>
@@ -71,7 +72,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.location.OpenStackProject#getSecurity_groups <em>Security groups</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.OpenStackProject#getFloatingips <em>Floatingips</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.location.LocationPackage#getOpenStackProject()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackUser.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackUser.java
index dd69e1c..bc654a7 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackUser.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackUser.java
@@ -32,10 +32,10 @@ import org.openecomp.ncomp.core.NamedEntity;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.OpenStackUser#getPassword <em>Password</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.location.LocationPackage#getOpenStackUser()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackVersion.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackVersion.java
index 2a4184b..d34ff87 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackVersion.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/OpenStackVersion.java
@@ -255,6 +255,8 @@ public enum OpenStackVersion implements Enumerator {
* Returns the '<em><b>Open Stack Version</b></em>' literal with the specified literal value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static OpenStackVersion get(String literal) {
@@ -271,6 +273,8 @@ public enum OpenStackVersion implements Enumerator {
* Returns the '<em><b>Open Stack Version</b></em>' literal with the specified name.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static OpenStackVersion getByName(String name) {
@@ -287,6 +291,8 @@ public enum OpenStackVersion implements Enumerator {
* Returns the '<em><b>Open Stack Version</b></em>' literal with the specified integer value.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static OpenStackVersion get(int value) {
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuInfoImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuInfoImpl.java
index fa02fa2..dd1aa7d 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuInfoImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuInfoImpl.java
@@ -48,6 +48,7 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuInfoImpl#getVendor <em>Vendor</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuInfoImpl#getModel <em>Model</em>}</li>
@@ -55,7 +56,6 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuInfoImpl#getFeatures <em>Features</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuInfoImpl#getTopology <em>Topology</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuTopologyImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuTopologyImpl.java
index f174236..9872312 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuTopologyImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorCpuTopologyImpl.java
@@ -39,12 +39,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuTopologyImpl#getCores <em>Cores</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuTopologyImpl#getThreads <em>Threads</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorCpuTopologyImpl#getSockets <em>Sockets</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorImpl.java
index f857f00..cb152bf 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorImpl.java
@@ -44,6 +44,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorImpl#getService <em>Service</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorImpl#getHost_ip <em>Host ip</em>}</li>
@@ -64,7 +65,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorImpl#getFree_ram_mb <em>Free ram mb</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorImpl#getId <em>Id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorServiceImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorServiceImpl.java
index b7b5e54..c85b322 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorServiceImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/HypervisorServiceImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorServiceImpl#getHost <em>Host</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.HypervisorServiceImpl#getId <em>Id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackLocationImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackLocationImpl.java
index 1b9ed42..2367642 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackLocationImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackLocationImpl.java
@@ -75,6 +75,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackLocationImpl#getCeilometerAvailableCapabilites <em>Ceilometer Available Capabilites</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackLocationImpl#getCeilometerUnavailableCapabilites <em>Ceilometer Unavailable Capabilites</em>}</li>
@@ -93,7 +94,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackLocationImpl#getFlavors <em>Flavors</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackLocationImpl#getHypervisors <em>Hypervisors</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackProjectImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackProjectImpl.java
index 3e36228..9ed957e 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackProjectImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackProjectImpl.java
@@ -72,6 +72,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackProjectImpl#getAlarms <em>Alarms</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackProjectImpl#getResources <em>Resources</em>}</li>
@@ -97,7 +98,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackProjectImpl#getSecurity_groups <em>Security groups</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackProjectImpl#getFloatingips <em>Floatingips</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackUserImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackUserImpl.java
index 836493c..d91d9c4 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackUserImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/impl/OpenStackUserImpl.java
@@ -40,10 +40,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.location.impl.OpenStackUserImpl#getPassword <em>Password</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/util/LocationSwitch.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/util/LocationSwitch.java
index d60e0c6..978dc83 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/util/LocationSwitch.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/location/util/LocationSwitch.java
@@ -76,7 +76,7 @@ public class LocationSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/AllocationPool.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/AllocationPool.java
index 63b5710..311aa86 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/AllocationPool.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/AllocationPool.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.AllocationPool#getStart <em>Start</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.AllocationPool#getEnd <em>End</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getAllocationPool()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/BindingVifDetail.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/BindingVifDetail.java
index a44f6ef..b7475b6 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/BindingVifDetail.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/BindingVifDetail.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.BindingVifDetail#getOvs_hybrid_plug <em>Ovs hybrid plug</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.BindingVifDetail#getPort_filter <em>Port filter</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getBindingVifDetail()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateNetworkRequest.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateNetworkRequest.java
index 88674e9..09f0240 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateNetworkRequest.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateNetworkRequest.java
@@ -31,6 +31,7 @@ package org.openecomp.ncomp.openstack.neutron;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateNetworkRequest#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateNetworkRequest#getProviderNetworkType <em>Provider Network Type</em>}</li>
@@ -39,7 +40,6 @@ package org.openecomp.ncomp.openstack.neutron;
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateNetworkRequest#getAdmin_state_up <em>Admin state up</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateNetworkRequest#getShared <em>Shared</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getCreateNetworkRequest()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreatePortRequest.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreatePortRequest.java
index ed9ed96..4740c4d 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreatePortRequest.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreatePortRequest.java
@@ -33,6 +33,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreatePortRequest#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreatePortRequest#getBindingVnicType <em>Binding Vnic Type</em>}</li>
@@ -42,7 +43,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreatePortRequest#getMac_address <em>Mac address</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreatePortRequest#getNetwork_id <em>Network id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getCreatePortRequest()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateRouterRequest.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateRouterRequest.java
index 38d3165..174b3e1 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateRouterRequest.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateRouterRequest.java
@@ -33,6 +33,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateRouterRequest#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateRouterRequest#getAdmin_state_up <em>Admin state up</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateRouterRequest#getPorts <em>Ports</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateRouterRequest#getSubnets <em>Subnets</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getCreateRouterRequest()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateSubnetRequest.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateSubnetRequest.java
index 95a6516..117705b 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateSubnetRequest.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/CreateSubnetRequest.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateSubnetRequest#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateSubnetRequest#getNetwork_id <em>Network id</em>}</li>
@@ -42,7 +43,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateSubnetRequest#getEnable_dhcp <em>Enable dhcp</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.CreateSubnetRequest#getGateway_ip <em>Gateway ip</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getCreateSubnetRequest()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/ExternalGateway.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/ExternalGateway.java
index 2c9293e..c28f6eb 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/ExternalGateway.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/ExternalGateway.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.ExternalGateway#getEnable_snat <em>Enable snat</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.ExternalGateway#getNetwork_id <em>Network id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getExternalGateway()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/FixedIp.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/FixedIp.java
index b671513..36c5183 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/FixedIp.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/FixedIp.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.FixedIp#getIp_address <em>Ip address</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.FixedIp#getSubnet_id <em>Subnet id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getFixedIp()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Network.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Network.java
index ccc92b6..64d9681 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Network.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Network.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Network#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Network#getName <em>Name</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.Network#getSubnets <em>Subnets</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Network#getTenant_id <em>Tenant id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getNetwork()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronFloatingIp.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronFloatingIp.java
index 4ae2622..327dcc5 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronFloatingIp.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronFloatingIp.java
@@ -31,6 +31,7 @@ package org.openecomp.ncomp.openstack.neutron;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronFloatingIp#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronFloatingIp#getName <em>Name</em>}</li>
@@ -42,7 +43,6 @@ package org.openecomp.ncomp.openstack.neutron;
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronFloatingIp#getTenant_id <em>Tenant id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronFloatingIp#getPort_id <em>Port id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getNeutronFloatingIp()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronPackage.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronPackage.java
index 33eb6b0..3724418 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronPackage.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronPackage.java
@@ -43,6 +43,24 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
* @see org.openecomp.ncomp.openstack.neutron.NeutronFactory
* @model kind="package"
* annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-openstack-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.openstack'"
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronSecurityGroup.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronSecurityGroup.java
index 28a36f8..8c49076 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronSecurityGroup.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronSecurityGroup.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronSecurityGroup#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronSecurityGroup#getName <em>Name</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronSecurityGroup#getSecurity_group_rules <em>Security group rules</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronSecurityGroup#getTenant_id <em>Tenant id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getNeutronSecurityGroup()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronSecurityRule.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronSecurityRule.java
index 94fa065..0eca087 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronSecurityRule.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/NeutronSecurityRule.java
@@ -31,6 +31,7 @@ package org.openecomp.ncomp.openstack.neutron;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronSecurityRule#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronSecurityRule#getDirection <em>Direction</em>}</li>
@@ -43,7 +44,6 @@ package org.openecomp.ncomp.openstack.neutron;
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronSecurityRule#getSecurity_group_id <em>Security group id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.NeutronSecurityRule#getTenant_id <em>Tenant id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getNeutronSecurityRule()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Port.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Port.java
index ca409f1..4746dd6 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Port.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Port.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Port#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Port#getName <em>Name</em>}</li>
@@ -53,7 +54,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.Port#getNetwork_id <em>Network id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Port#getSecurity_groups <em>Security groups</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getPort()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Router.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Router.java
index aa7b0ab..9591bf5 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Router.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Router.java
@@ -31,6 +31,7 @@ package org.openecomp.ncomp.openstack.neutron;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Router#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Router#getName <em>Name</em>}</li>
@@ -39,7 +40,6 @@ package org.openecomp.ncomp.openstack.neutron;
* <li>{@link org.openecomp.ncomp.openstack.neutron.Router#getExternal_gateway_info <em>External gateway info</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Router#getTenant_id <em>Tenant id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getRouter()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Subnet.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Subnet.java
index 01f824b..8769202 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Subnet.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/Subnet.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.common.util.EList;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Subnet#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Subnet#getName <em>Name</em>}</li>
@@ -47,7 +48,6 @@ import org.eclipse.emf.common.util.EList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.Subnet#getNetwork_id <em>Network id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.Subnet#getTenant_id <em>Tenant id</em>}</li>
* </ul>
- * </p>
*
* @see org.openecomp.ncomp.openstack.neutron.NeutronPackage#getSubnet()
* @model
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/AllocationPoolImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/AllocationPoolImpl.java
index 2bb19b7..5b33eae 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/AllocationPoolImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/AllocationPoolImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.AllocationPoolImpl#getStart <em>Start</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.AllocationPoolImpl#getEnd <em>End</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/BindingProfileImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/BindingProfileImpl.java
index 6c0f7b2..a8af98a 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/BindingProfileImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/BindingProfileImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Binding Profile</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/BindingVifDetailImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/BindingVifDetailImpl.java
index 32770b5..7c9c598 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/BindingVifDetailImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/BindingVifDetailImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.BindingVifDetailImpl#getOvs_hybrid_plug <em>Ovs hybrid plug</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.BindingVifDetailImpl#getPort_filter <em>Port filter</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateNetworkRequestImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateNetworkRequestImpl.java
index 6daf134..cc625e4 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateNetworkRequestImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateNetworkRequestImpl.java
@@ -38,6 +38,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateNetworkRequestImpl#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateNetworkRequestImpl#getProviderNetworkType <em>Provider Network Type</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateNetworkRequestImpl#getAdmin_state_up <em>Admin state up</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateNetworkRequestImpl#getShared <em>Shared</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreatePortRequestImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreatePortRequestImpl.java
index 0babe21..48b1ad2 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreatePortRequestImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreatePortRequestImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreatePortRequestImpl#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreatePortRequestImpl#getBindingVnicType <em>Binding Vnic Type</em>}</li>
@@ -51,7 +52,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreatePortRequestImpl#getMac_address <em>Mac address</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreatePortRequestImpl#getNetwork_id <em>Network id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateRouterRequestImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateRouterRequestImpl.java
index 9da0436..11f13bf 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateRouterRequestImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateRouterRequestImpl.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateRouterRequestImpl#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateRouterRequestImpl#getAdmin_state_up <em>Admin state up</em>}</li>
@@ -49,7 +50,6 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateRouterRequestImpl#getPorts <em>Ports</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateRouterRequestImpl#getSubnets <em>Subnets</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateSubnetRequestImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateSubnetRequestImpl.java
index ef8f399..a71ee9d 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateSubnetRequestImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/CreateSubnetRequestImpl.java
@@ -49,6 +49,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateSubnetRequestImpl#getName <em>Name</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateSubnetRequestImpl#getNetwork_id <em>Network id</em>}</li>
@@ -59,7 +60,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateSubnetRequestImpl#getEnable_dhcp <em>Enable dhcp</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.CreateSubnetRequestImpl#getGateway_ip <em>Gateway ip</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/ExternalGatewayImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/ExternalGatewayImpl.java
index 85e873b..dbec378 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/ExternalGatewayImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/ExternalGatewayImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.ExternalGatewayImpl#getEnable_snat <em>Enable snat</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.ExternalGatewayImpl#getNetwork_id <em>Network id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/FixedIpImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/FixedIpImpl.java
index e61d5df..35e9293 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/FixedIpImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/FixedIpImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.FixedIpImpl#getIp_address <em>Ip address</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.FixedIpImpl#getSubnet_id <em>Subnet id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NetworkImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NetworkImpl.java
index ea878d3..3618d11 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NetworkImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NetworkImpl.java
@@ -44,6 +44,7 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NetworkImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NetworkImpl#getName <em>Name</em>}</li>
@@ -57,7 +58,6 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NetworkImpl#getSubnets <em>Subnets</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NetworkImpl#getTenant_id <em>Tenant id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronFloatingIpImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronFloatingIpImpl.java
index 7e4e1fb..0f0202d 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronFloatingIpImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronFloatingIpImpl.java
@@ -38,6 +38,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronFloatingIpImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronFloatingIpImpl#getName <em>Name</em>}</li>
@@ -49,7 +50,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronFloatingIpImpl#getTenant_id <em>Tenant id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronFloatingIpImpl#getPort_id <em>Port id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronObjectImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronObjectImpl.java
index 7a5b76e..042ba66 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronObjectImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronObjectImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Object</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronRequestImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronRequestImpl.java
index d2c350d..0820001 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronRequestImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronRequestImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Request</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronSecurityGroupImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronSecurityGroupImpl.java
index 70d84c1..09f7051 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronSecurityGroupImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronSecurityGroupImpl.java
@@ -48,6 +48,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronSecurityGroupImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronSecurityGroupImpl#getName <em>Name</em>}</li>
@@ -55,7 +56,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronSecurityGroupImpl#getSecurity_group_rules <em>Security group rules</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronSecurityGroupImpl#getTenant_id <em>Tenant id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronSecurityRuleImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronSecurityRuleImpl.java
index 3a5d53e..f7f19e5 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronSecurityRuleImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronSecurityRuleImpl.java
@@ -38,6 +38,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronSecurityRuleImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronSecurityRuleImpl#getDirection <em>Direction</em>}</li>
@@ -50,7 +51,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronSecurityRuleImpl#getSecurity_group_id <em>Security group id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.NeutronSecurityRuleImpl#getTenant_id <em>Tenant id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronServiceImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronServiceImpl.java
index 9dc051f..d77015d 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronServiceImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/NeutronServiceImpl.java
@@ -42,8 +42,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Service</b></em>'.
* <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/PortImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/PortImpl.java
index 2af9613..f0c7750 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/PortImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/PortImpl.java
@@ -52,6 +52,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.PortImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.PortImpl#getName <em>Name</em>}</li>
@@ -73,7 +74,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.PortImpl#getNetwork_id <em>Network id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.PortImpl#getSecurity_groups <em>Security groups</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/RouterImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/RouterImpl.java
index 077962f..1f8d58f 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/RouterImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/RouterImpl.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.RouterImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.RouterImpl#getName <em>Name</em>}</li>
@@ -49,7 +50,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.RouterImpl#getExternal_gateway_info <em>External gateway info</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.RouterImpl#getTenant_id <em>Tenant id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/SubnetImpl.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/SubnetImpl.java
index d7216ba..e53b709 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/SubnetImpl.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/impl/SubnetImpl.java
@@ -49,6 +49,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.SubnetImpl#getId <em>Id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.SubnetImpl#getName <em>Name</em>}</li>
@@ -64,7 +65,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.SubnetImpl#getNetwork_id <em>Network id</em>}</li>
* <li>{@link org.openecomp.ncomp.openstack.neutron.impl.SubnetImpl#getTenant_id <em>Tenant id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/util/NeutronSwitch.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/util/NeutronSwitch.java
index 0774772..7880ae3 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/util/NeutronSwitch.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/neutron/util/NeutronSwitch.java
@@ -70,7 +70,7 @@ public class NeutronSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/util/OpenstackSwitch.java b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/util/OpenstackSwitch.java
index 209bbe1..bf70561 100644
--- a/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/util/OpenstackSwitch.java
+++ b/ncomp-openstack-model/src/main/xcore-gen/org/openecomp/ncomp/openstack/util/OpenstackSwitch.java
@@ -68,7 +68,7 @@ public class OpenstackSwitch<T> extends Switch<T> {
* Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/pom.xml b/pom.xml
index 779fb97..8d40804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.ncomp.openstack</groupId>
<artifactId>ncomp-openstack</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ncomp-openstack</name>
@@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
- </properties>
+ <nexusproxy>https://nexus.onap.org</nexusproxy></properties>
@@ -43,7 +43,7 @@
<parent>
<groupId>org.openecomp.ncomp.maven</groupId>
<artifactId>ncomp-maven-base</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../dcae-org.openecomp.ncomp.maven/ncomp-maven-base</relativePath>
</parent>
diff --git a/version.properties b/version.properties
index c0f2742..13f6d31 100644
--- a/version.properties
+++ b/version.properties
@@ -2,7 +2,7 @@
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=0
+minor=1
patch=0
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins