[CCAMP] [ietf-ccamp-wg/draft-ietf-ccamp-optical-impairment-topology-yang] d8e5f8: simplify the tree using suggestion in PR#22 (#50)

Esther Le Rouzic <noreply@github.com> Wed, 10 February 2021 10:03 UTC

Return-Path: <noreply@github.com>
X-Original-To: ccamp@ietfa.amsl.com
Delivered-To: ccamp@ietfa.amsl.com
Received: from localhost (localhost [127.0.0.1]) by ietfa.amsl.com (Postfix) with ESMTP id 4BF5A3A104A for <ccamp@ietfa.amsl.com>; Wed, 10 Feb 2021 02:03:55 -0800 (PST)
X-Virus-Scanned: amavisd-new at amsl.com
X-Spam-Flag: NO
X-Spam-Score: -2.35
X-Spam-Level:
X-Spam-Status: No, score=-2.35 tagged_above=-999 required=5 tests=[BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=ham autolearn_force=no
Authentication-Results: ietfa.amsl.com (amavisd-new); dkim=pass (1024-bit key) header.d=github.com
Received: from mail.ietf.org ([4.31.198.44]) by localhost (ietfa.amsl.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 56WP3QzsGUQi for <ccamp@ietfa.amsl.com>; Wed, 10 Feb 2021 02:03:54 -0800 (PST)
Received: from out-23.smtp.github.com (out-23.smtp.github.com [192.30.252.206]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ietfa.amsl.com (Postfix) with ESMTPS id F3F8F3A1044 for <ccamp@ietf.org>; Wed, 10 Feb 2021 02:03:53 -0800 (PST)
Received: from github.com (hubbernetes-node-3d14d56.ac4-iad.github.net [10.52.118.53]) by smtp.github.com (Postfix) with ESMTPA id 13056600C08 for <ccamp@ietf.org>; Wed, 10 Feb 2021 02:03:53 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=github.com; s=pf2014; t=1612951433; bh=iWwhp3f4m2AN2/hdpY9S/CDNFtIomfc9czqxf7TOOjc=; h=Date:From:To:Subject:From; b=v0hVQOXoY3eTNmqFNSJdWt8kx5P1uLhisRzgXg0gczSkughWAfsoka/aE6tdjRvCa shfbqdkExC2lYw39fRWT5h6r+uWPOn+m3omWzyK8cYUjud/3C3dDHozpV0D8X/uL8s Zqp5YoSMY3BZLOKSkjNmoO5hbYFZ3qeEujRWWUT4=
Date: Wed, 10 Feb 2021 02:03:53 -0800
From: Esther Le Rouzic <noreply@github.com>
To: ccamp@ietf.org
Message-ID: <ietf-ccamp-wg/draft-ietf-ccamp-optical-impairment-topology-yang/push/refs/heads/master/60f690-d8e5f8@github.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-GitHub-Recipient-Address: ccamp@ietf.org
X-Auto-Response-Suppress: All
Archived-At: <https://mailarchive.ietf.org/arch/msg/ccamp/3EMvhPGGBFTs89aZKCytos59Kzg>
Subject: [CCAMP] [ietf-ccamp-wg/draft-ietf-ccamp-optical-impairment-topology-yang] d8e5f8: simplify the tree using suggestion in PR#22 (#50)
X-BeenThere: ccamp@ietf.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Discussion list for the CCAMP working group <ccamp.ietf.org>
List-Unsubscribe: <https://www.ietf.org/mailman/options/ccamp>, <mailto:ccamp-request@ietf.org?subject=unsubscribe>
List-Archive: <https://mailarchive.ietf.org/arch/browse/ccamp/>
List-Post: <mailto:ccamp@ietf.org>
List-Help: <mailto:ccamp-request@ietf.org?subject=help>
List-Subscribe: <https://www.ietf.org/mailman/listinfo/ccamp>, <mailto:ccamp-request@ietf.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Feb 2021 10:03:55 -0000

  Branch: refs/heads/master
  Home:   https://github.com/ietf-ccamp-wg/draft-ietf-ccamp-optical-impairment-topology-yang
  Commit: d8e5f8634735d61091b4352a6823fd9fde0c7292
      https://github.com/ietf-ccamp-wg/draft-ietf-ccamp-optical-impairment-topology-yang/commit/d8e5f8634735d61091b4352a6823fd9fde0c7292
  Author: Esther Le Rouzic <EstherLerouzic@users.noreply.github.com>
  Date:   2021-02-10 (Wed, 10 Feb 2021)

  Changed paths:
    M .travis.yml
    M ietf-optical-impairment-topology.tree
    M ietf-optical-impairment-topology.yang
    M requirements.txt

  Log Message:
  -----------
  simplify the tree using suggestion in PR#22 (#50)

* update pyang and python versions

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>

* simplify the tree using suggestion in PR#22

remove the type since th name of the container is explicitly giving the type,
remove the extra element encapsultation to simplify the tree

instance example before:
"OMS-elements":[
{
   "elt-index": 0,
   "uid": "booster_in_RoadmA_to_RoadmB",
   "type": "Edfa",
   "element": {
       "amplifier": {
            "type-variety": "std_medium_gain",
            "operational": {
                "actual-gain": 16,
                 "tilt-target": 0,
                 ...
             }
        }
    }
},
{
   "elt-index": 1,
   "uid": "Fiber_RoadmA_to_RoadmB",
   "type": "Fiber",
   "element": {
        "fiber": {
            "type-variety": "SMF",
            "length": 71,
            ....
        }
    }
},
{
....

after the change:

"OMS-elements":[
{
   "elt-index": 0,
   "uid": "booster_in_RoadmA_to_RoadmB",
   "amplifier": {
       "type-variety": "std_medium_gain",
       "operational": {
           "actual-gain": 16,
           "tilt-target": 0,
           ...
        }
    }
},
{
   "elt-index": 1,
   "uid": "Fiber_RoadmA_to_RoadmB",
   "fiber": {
       "type-variety": "SMF",
       "length": 71,
       ....
   }
},
{
....
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
Co-authored-by: Jan Kundrát <jan.kundrat@cesnet.cs>

* Add mandatory attribute  in concentrated loss and in element choice

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>

* update tree to be compliant with the yang

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>

* update the tree with 69 char width

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>