remove labels from VnfdAndVnfInstance.rst

Change-Id: Ib7f2466baf5d3e4c50f6baa07dc438610482ec11
Issue-ID: MODELING-108
Signed-off-by: yxpoke <yangxu5@huawei.com>

2 files changed, 67 insertions, 75 deletions

diff --git a/docs/ONAP Model Spec/im/VnfdAndVnfInstance.rst b/docs/ONAP Model Spec/im/VnfdAndVnfInstance.rst
index d4d4b3c..11817f1 100644
--- a/docs/ONAP Model Spec/im/VnfdAndVnfInstance.rst
+++ b/docs/ONAP Model Spec/im/VnfdAndVnfInstance.rst
@@ -4,32 +4,36 @@
 
 ONAP Vnf Sub Model
 
-1. .. rubric:: Diagrams
-      :name: diagrams
+.. contents::
+   :depth: 3
+..
 
-   1. .. rubric:: ONAP Vnfd - Topology View
-         :name: onap-vnfd---topology-view
+Diagrams
+========
 
-   2. .. rubric:: ONAP Vnfd View
-         :name: onap-vnfd-view
+ONAP Vnfd - Topology View
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ONAP Vnfd View
+~~~~~~~~~~~~~~
 
-   3. .. rubric:: VNF Datatypes
-         :name: vnf-datatypes
+VNF Datatypes
+~~~~~~~~~~~~~
 
-   4. .. rubric:: VNF Instance
-         :name: vnf-instance
+VNF Instance
+~~~~~~~~~~~~
 
-   5. .. rubric:: Vnf Deployment Flavor
-         :name: vnf-deployment-flavor
+Vnf Deployment Flavor
+~~~~~~~~~~~~~~~~~~~~~
 
-   6. .. rubric:: Vnf Element Group
-         :name: vnf-element-group
+Vnf Element Group
+~~~~~~~~~~~~~~~~~
 
-2. .. rubric:: Classes
-      :name: classes
+Classes
+=======
 
-   7. .. rubric:: BaseConfigGroup
-         :name: baseconfiggroup
+BaseConfigGroup
+~~~~~~~~~~~~~~~
 
 Every Vnf contains a BaseConfigGroup. BaseConfigGroup may set Access
 Control Lists (ACL's) and establish security groups and server groups.
@@ -48,8 +52,8 @@ Applied stereotypes:
 
 -  support: MANDATORY
 
-   8. .. rubric:: DeploymentGroup
-         :name: deploymentgroup
+DeploymentGroup
+~~~~~~~~~~~~~~~
 
 DeploymentGroup provides the minimum viable VDU and associated VNFC
 configuration for a useable VNF. I can have a small, medium, large
@@ -65,8 +69,8 @@ Applied stereotypes:
 
 -  support: MANDATORY
 
-   9. .. rubric:: HomingGroup
-         :name: hominggroup
+HomingGroup
+~~~~~~~~~~~
 
 Homing selects what cloud selection strategy will be used. HomingGroup
 is used to determine where VNF's within a given group are placed with
@@ -458,8 +462,8 @@ Applied stereotypes:
      - References to VnfVirtualLinkDesc that are part of this group.
 
 	 
-13. .. rubric:: ScalingAspect
-       :name: scalingaspect
+ScalingAspect
+~~~~~~~~~~~~~
 
 The ScalingAspect class describes the details of an aspect used for
 horizontal scaling.
@@ -472,8 +476,8 @@ Applied stereotypes:
 
 -  support: MANDATORY
 
-   14. .. rubric:: ScalingGroup
-          :name: scalinggroup
+ScalingGroup
+~~~~~~~~~~~~
 
 A ScalingGroup determines which VNFC's (VDU's) are scaled together based
 on demand.
@@ -488,8 +492,8 @@ Applied stereotypes:
 
 -  support: MANDATORY
 
-   15. .. rubric:: SwImageDesc
-          :name: swimagedesc
+SwImageDesc
+~~~~~~~~~~~
 
 The SwImageDesc information element describes requested additional
 capability for a particular VDU. Such a capability may be for
@@ -2210,8 +2214,8 @@ Applied stereotypes:
 
 -  support: MANDATORY
 
-   29. .. rubric:: VnfExtCpd
-          :name: vnfextcpd
+VnfExtCpd
+~~~~~~~~~
 
 Applied stereotypes:
 
@@ -2344,8 +2348,8 @@ Applied stereotypes:
 
 -  support: MANDATORY
 
-   32. .. rubric:: Vnfc
-          :name: vnfc
+Vnfc
+~~~~
 
 An internal component of a VNF providing a VNF Provider a defined
 sub-set of that VNF's functionality, with the main characteristic that a
@@ -2591,8 +2595,8 @@ Applied stereotypes:
 
 -  support: MANDATORY
 
-   34. .. rubric:: Vnfd
-          :name: vnfd
+Vnfd
+~~~~
 
 A Vnfd, or VNF Descriptor, is template which describes a VNF in terms of
 deployment and operational behaviour requirements. It also contains
@@ -2999,11 +3003,11 @@ Applied stereotypes:
      - References to VnfVirtualLinkDesc that are part of this group.
 
 
-3. .. rubric:: Data Types
-      :name: data-types
+Data Types
+==========
 
-   36. .. rubric:: LifecycleManagementScript
-          :name: lifecyclemanagementscript
+LifecycleManagementScript
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. list-table::
    :header-rows: 1
@@ -3745,11 +3749,11 @@ VNFM.
      - It provides VNFC configurable properties that can be modified using the ModifyVnfInfo operation.
 
 
-4. .. rubric:: Enumerations
-      :name: enumerations
+Enumerations
+============
 
-   49. .. rubric:: AddressType
-          :name: addresstype
+AddressType
+~~~~~~~~~~~
 
 Type of address
 
@@ -3759,8 +3763,8 @@ Contains Enumeration Literals:
 
 -  IP:
 
-   50. .. rubric:: ClosedLoopStatus
-          :name: closedloopstatus
+ClosedLoopStatus
+~~~~~~~~~~~~~~~~
 
 Contains Enumeration Literals:
 
@@ -3768,8 +3772,8 @@ Contains Enumeration Literals:
 
 -  DISABLED:
 
-   51. .. rubric:: CollectionPeriod
-          :name: collectionperiod
+CollectionPeriod
+~~~~~~~~~~~~~~~~
 
 Specifies the periodicity at which the producer will collect performance
 information.
@@ -3785,8 +3789,8 @@ Contains Enumeration Literals:
 
 -  isolation:
 
-   53. .. rubric:: LcmEvent
-          :name: lcmevent
+LcmEvent
+~~~~~~~~
 
 Describes VNF lifecycle event(s) or an external stimulus detected on a
 VNFM reference point.
@@ -3829,8 +3833,8 @@ Contains Enumeration Literals:
 
 -  EVENT_END_VNFINFO_MODIFICATION:
 
-   54. .. rubric:: OperationalStatus
-          :name: operationalstatus
+OperationalStatus
+~~~~~~~~~~~~~~~~~
 
 Indicator for whether the resource is considered operational. Valid
 values are in-service-path and out-of-service-path.
@@ -3841,8 +3845,8 @@ Contains Enumeration Literals:
 
 -  OUT-OF-SERVICE-PATH:
 
-   55. .. rubric:: OrchestrationStatus
-          :name: orchestrationstatus
+OrchestrationStatus
+~~~~~~~~~~~~~~~~~~~
 
 Contains Enumeration Literals:
 
@@ -3854,8 +3858,8 @@ Contains Enumeration Literals:
 
 -  ACTIVE:
 
-   56. .. rubric:: PinningPolicy
-          :name: pinningpolicy
+PinningPolicy
+~~~~~~~~~~~~~
 
 Defines the CPU pinning policy.
 
@@ -3865,8 +3869,8 @@ Contains Enumeration Literals:
 
 -  DYNAMIC:
 
-   57. .. rubric:: PlacementStrategy
-          :name: placementstrategy
+PlacementStrategy
+~~~~~~~~~~~~~~~~~
 
 Contains Enumeration Literals:
 
@@ -3876,8 +3880,8 @@ Contains Enumeration Literals:
 
 -  EXCLUSIVITY:
 
-   58. .. rubric:: ProvStatus
-          :name: provstatus
+ProvStatus
+~~~~~~~~~~
 
 Provisioning status, used as a trigger for operational monitoring of
 this resource by service assurance systems.
@@ -3890,8 +3894,8 @@ Contains Enumeration Literals:
 
 -  CAPPED:
 
-   59. .. rubric:: VnfSource
-          :name: vnfsource
+VnfSource
+~~~~~~~~~
 
 Describes the source of the indicator.
 
@@ -3903,8 +3907,8 @@ Contains Enumeration Literals:
 
 -  BOTH:
 
-   60. .. rubric:: VnicType
-          :name: vnictype
+VnicType
+~~~~~~~~
 
 Describes the type of VNIC to which a CP attaches.
 
@@ -3922,16 +3926,4 @@ Contains Enumeration Literals:
 
 -  VIRTIO_FORWARDER:
 
-   5. .. rubric:: Primitives
-         :name: primitives
-
-   6. .. rubric:: Interfaces
-         :name: interfaces
-
-7. .. rubric:: Signals
-      :name: signals
-
-8. .. rubric:: Operations
-      :name: operations
-
 
diff --git a/docs/ONAP Model Spec/im/index.rst b/docs/ONAP Model Spec/im/index.rst
index e0c8830..905f740 100644
--- a/docs/ONAP Model Spec/im/index.rst
+++ b/docs/ONAP Model Spec/im/index.rst
@@ -10,7 +10,7 @@ ONAP Information Model Specifications
 =====================================
 
 .. toctree::
-   :titlesonly:
+   :maxdepth: 2
 
    VnfdAndVnfInstance
    NSD